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

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



Filling in the padding slot in the bpf structure as a bug fix in 'ne'
overlapped with actually using that padding area for something in
'net-next'.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents eaf47b17 918fe1b3

Documentation/devicetree/bindings/net/dsa/b53.txt

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ Required properties: 
      "brcm,bcm53128"

      "brcm,bcm5365"

      "brcm,bcm5395"

      "brcm,bcm5389"

      "brcm,bcm5397"

      "brcm,bcm5398"

Documentation/i2c/busses/i2c-ocores

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ Kernel driver i2c-ocores 


Supported adapters:

  * OpenCores.org I2C controller by Richard Herveille (see datasheet link)

    Datasheet: http://www.opencores.org/projects.cgi/web/i2c/overview

    https://opencores.org/project/i2c/overview



Author: Peter Korsgaard <jacmet@sunsite.dk>

MAINTAINERS

+8 −0
Original line number Diff line number Diff line
@@ -15554,6 +15554,14 @@ L: linux-kernel@vger.kernel.org 
S:	Supported

F:	drivers/char/xillybus/



XLP9XX I2C DRIVER

M:	George Cherian <george.cherian@cavium.com>

M:	Jan Glauber <jglauber@cavium.com>

L:	linux-i2c@vger.kernel.org

W:	http://www.cavium.com

S:	Supported

F:	drivers/i2c/busses/i2c-xlp9xx.c



XRA1403 GPIO EXPANDER

M:	Nandor Han <nandor.han@ge.com>

M:	Semi Malinen <semi.malinen@ge.com>

Makefile

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

PATCHLEVEL = 17

SUBLEVEL = 0

EXTRAVERSION = -rc6

EXTRAVERSION = -rc7

NAME = Merciless Moray



# *DOCUMENTATION*
@@ -500,6 +500,9 @@ RETPOLINE_CFLAGS_CLANG := -mretpoline-external-thunk 
RETPOLINE_CFLAGS := $(call cc-option,$(RETPOLINE_CFLAGS_GCC),$(call cc-option,$(RETPOLINE_CFLAGS_CLANG)))

export RETPOLINE_CFLAGS



KBUILD_CFLAGS	+= $(call cc-option,-fno-PIE)

KBUILD_AFLAGS	+= $(call cc-option,-fno-PIE)



# check for 'asm goto'

ifeq ($(call shell-cached,$(CONFIG_SHELL) $(srctree)/scripts/gcc-goto.sh $(CC) $(KBUILD_CFLAGS)), y)

  CC_HAVE_ASM_GOTO := 1
@@ -621,9 +624,9 @@ endif # $(dot-config) 
# Defaults to vmlinux, but the arch makefile usually adds further targets

all: vmlinux



KBUILD_CFLAGS	+= $(call cc-option,-fno-PIE)

KBUILD_AFLAGS	+= $(call cc-option,-fno-PIE)

CFLAGS_GCOV	:= -fprofile-arcs -ftest-coverage -fno-tree-loop-im $(call cc-disable-warning,maybe-uninitialized,)

CFLAGS_GCOV	:= -fprofile-arcs -ftest-coverage \

	$(call cc-option,-fno-tree-loop-im) \

	$(call cc-disable-warning,maybe-uninitialized,)

export CFLAGS_GCOV CFLAGS_KCOV



# The arch Makefile can set ARCH_{CPP,A,C}FLAGS to override the default

arch/arm/boot/dts/sun4i-a10.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ 
			allwinner,pipeline = "de_fe0-de_be0-lcd0-hdmi";

			clocks = <&ccu CLK_AHB_LCD0>, <&ccu CLK_AHB_HDMI0>,

				 <&ccu CLK_AHB_DE_BE0>, <&ccu CLK_AHB_DE_FE0>,

				 <&ccu CLK_DE_BE0>, <&ccu CLK_AHB_DE_FE0>,

				 <&ccu CLK_DE_BE0>, <&ccu CLK_DE_FE0>,

				 <&ccu CLK_TCON0_CH1>, <&ccu CLK_HDMI>,

				 <&ccu CLK_DRAM_DE_FE0>, <&ccu CLK_DRAM_DE_BE0>;

			status = "disabled";
@@ -88,7 +88,7 @@ 
			allwinner,pipeline = "de_fe0-de_be0-lcd0";

			clocks = <&ccu CLK_AHB_LCD0>, <&ccu CLK_AHB_DE_BE0>,

				 <&ccu CLK_AHB_DE_FE0>, <&ccu CLK_DE_BE0>,

				 <&ccu CLK_AHB_DE_FE0>, <&ccu CLK_TCON0_CH0>,

				 <&ccu CLK_DE_FE0>, <&ccu CLK_TCON0_CH0>,

				 <&ccu CLK_DRAM_DE_FE0>, <&ccu CLK_DRAM_DE_BE0>;

			status = "disabled";

		};
@@ -99,7 +99,7 @@ 
			allwinner,pipeline = "de_fe0-de_be0-lcd0-tve0";

			clocks = <&ccu CLK_AHB_TVE0>, <&ccu CLK_AHB_LCD0>,

				 <&ccu CLK_AHB_DE_BE0>, <&ccu CLK_AHB_DE_FE0>,

				 <&ccu CLK_DE_BE0>, <&ccu CLK_AHB_DE_FE0>,

				 <&ccu CLK_DE_BE0>, <&ccu CLK_DE_FE0>,

				 <&ccu CLK_TCON0_CH1>, <&ccu CLK_DRAM_TVE0>,

				 <&ccu CLK_DRAM_DE_FE0>, <&ccu CLK_DRAM_DE_BE0>;

			status = "disabled";