Commit d864991b authored by David S. Miller's avatar David S. Miller
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 



Conflicts were easy to resolve using immediate context mostly,
except the cls_u32.c one where I simply too the entire HEAD
chunk.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents a688c53a bab5c80b

Documentation/driver-api/fpga/fpga-mgr.rst

+5 −0
Original line number Diff line number Diff line
@@ -184,6 +184,11 @@ API for implementing a new FPGA Manager driver 
API for programming an FPGA

---------------------------



FPGA Manager flags



.. kernel-doc:: include/linux/fpga/fpga-mgr.h

   :doc: FPGA Manager flags



.. kernel-doc:: include/linux/fpga/fpga-mgr.h

   :functions: fpga_image_info

MAINTAINERS

+3 −2
Original line number Diff line number Diff line
@@ -9680,7 +9680,8 @@ MIPS/LOONGSON2 ARCHITECTURE 
M:	Jiaxun Yang <jiaxun.yang@flygoat.com>

L:	linux-mips@linux-mips.org

S:	Maintained

F:	arch/mips/loongson64/*{2e/2f}*

F:	arch/mips/loongson64/fuloong-2e/

F:	arch/mips/loongson64/lemote-2f/

F:	arch/mips/include/asm/mach-loongson64/

F:	drivers/*/*loongson2*

F:	drivers/*/*/*loongson2*
@@ -9887,7 +9888,7 @@ M: Peter Rosin <peda@axentia.se> 
S:	Maintained

F:	Documentation/ABI/testing/sysfs-class-mux*

F:	Documentation/devicetree/bindings/mux/

F:	include/linux/dt-bindings/mux/

F:	include/dt-bindings/mux/

F:	include/linux/mux/

F:	drivers/mux/

Makefile

+6 −4
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 0

EXTRAVERSION = -rc6

EXTRAVERSION = -rc7

NAME = Merciless Moray



# *DOCUMENTATION*
@@ -483,13 +483,15 @@ endif 
ifeq ($(cc-name),clang)

ifneq ($(CROSS_COMPILE),)

CLANG_TARGET	:= --target=$(notdir $(CROSS_COMPILE:%-=%))

GCC_TOOLCHAIN	:= $(realpath $(dir $(shell which $(LD)))/..)

GCC_TOOLCHAIN_DIR := $(dir $(shell which $(LD)))

CLANG_PREFIX	:= --prefix=$(GCC_TOOLCHAIN_DIR)

GCC_TOOLCHAIN	:= $(realpath $(GCC_TOOLCHAIN_DIR)/..)

endif

ifneq ($(GCC_TOOLCHAIN),)

CLANG_GCC_TC	:= --gcc-toolchain=$(GCC_TOOLCHAIN)

endif

KBUILD_CFLAGS += $(CLANG_TARGET) $(CLANG_GCC_TC)

KBUILD_AFLAGS += $(CLANG_TARGET) $(CLANG_GCC_TC)

KBUILD_CFLAGS += $(CLANG_TARGET) $(CLANG_GCC_TC) $(CLANG_PREFIX)

KBUILD_AFLAGS += $(CLANG_TARGET) $(CLANG_GCC_TC) $(CLANG_PREFIX)

KBUILD_CFLAGS += $(call cc-option, -no-integrated-as)

KBUILD_AFLAGS += $(call cc-option, -no-integrated-as)

endif

arch/arc/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ config ARC_CPU_770 
	  Support for ARC770 core introduced with Rel 4.10 (Summer 2011)

	  This core has a bunch of cool new features:

	  -MMU-v3: Variable Page Sz (4k, 8k, 16k), bigger J-TLB (128x4)

                   Shared Address Spaces (for sharing TLB entires in MMU)

                   Shared Address Spaces (for sharing TLB entries in MMU)

	  -Caches: New Prog Model, Region Flush

	  -Insns: endian swap, load-locked/store-conditional, time-stamp-ctr

arch/arc/Makefile

+2 −24
Original line number Diff line number Diff line
@@ -6,33 +6,11 @@ 
# published by the Free Software Foundation.

#



ifeq ($(CROSS_COMPILE),)

ifndef CONFIG_CPU_BIG_ENDIAN

CROSS_COMPILE := arc-linux-

else

CROSS_COMPILE := arceb-linux-

endif

endif



KBUILD_DEFCONFIG := nsim_700_defconfig



cflags-y	+= -fno-common -pipe -fno-builtin -mmedium-calls -D__linux__

cflags-$(CONFIG_ISA_ARCOMPACT)	+= -mA7

cflags-$(CONFIG_ISA_ARCV2)	+= -mcpu=archs



is_700 = $(shell $(CC) -dM -E - < /dev/null | grep -q "ARC700" && echo 1 || echo 0)



ifdef CONFIG_ISA_ARCOMPACT

ifeq ($(is_700), 0)

    $(error Toolchain not configured for ARCompact builds)

endif

endif



ifdef CONFIG_ISA_ARCV2

ifeq ($(is_700), 1)

    $(error Toolchain not configured for ARCv2 builds)

endif

endif

cflags-$(CONFIG_ISA_ARCV2)	+= -mcpu=hs38



ifdef CONFIG_ARC_CURR_IN_REG

# For a global register defintion, make sure it gets passed to every file
@@ -79,7 +57,7 @@ cflags-$(disable_small_data) += -mno-sdata -fcall-used-gp 
cflags-$(CONFIG_CPU_BIG_ENDIAN)		+= -mbig-endian

ldflags-$(CONFIG_CPU_BIG_ENDIAN)	+= -EB



LIBGCC	:= $(shell $(CC) $(cflags-y) --print-libgcc-file-name)

LIBGCC	= $(shell $(CC) $(cflags-y) --print-libgcc-file-name)



# Modules with short calls might break for calls into builtin-kernel

KBUILD_CFLAGS_MODULE	+= -mlong-calls -mno-millicode