Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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



The new route handling in ip_mc_finish_output() from 'net' overlapped
with the new support for returning congestion notifications from BPF
programs.

In order to handle this I had to take the dev_loopback_xmit() calls
out of the switch statement.

The aquantia driver conflicts were simple overlapping changes.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 3a495844 556e2f60

MAINTAINERS

+2 −0
Original line number Diff line number Diff line
@@ -3131,6 +3131,7 @@ F: arch/arm/mach-bcm/ 
BROADCOM BCM2835 ARM ARCHITECTURE

M:	Eric Anholt <eric@anholt.net>

M:	Stefan Wahren <wahrenst@gmx.net>

L:	bcm-kernel-feedback-list@broadcom.com

L:	linux-rpi-kernel@lists.infradead.org (moderated for non-subscribers)

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

T:	git git://github.com/anholt/linux
@@ -3160,6 +3161,7 @@ F: arch/arm/boot/dts/bcm953012* 


BROADCOM BCM53573 ARM ARCHITECTURE

M:	Rafał Miłecki <rafal@milecki.pl>

L:	bcm-kernel-feedback-list@broadcom.com

L:	linux-arm-kernel@lists.infradead.org

S:	Maintained

F:	arch/arm/boot/dts/bcm53573*

Makefile

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

PATCHLEVEL = 2

SUBLEVEL = 0

EXTRAVERSION = -rc5

EXTRAVERSION = -rc6

NAME = Golden Lions



# *DOCUMENTATION*

arch/arm/boot/dts/gemini-dlink-dir-685.dts

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
	};



	chosen {

		bootargs = "console=ttyS0,19200n8 root=/dev/sda1 rw rootwait";

		bootargs = "console=ttyS0,19200n8 root=/dev/sda1 rw rootwait consoleblank=300";

		stdout-path = "uart0:19200n8";

	};

arch/arm/boot/dts/gemini-dlink-dns-313.dts

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 


/ {

	model = "D-Link DNS-313 1-Bay Network Storage Enclosure";

	compatible = "dlink,dir-313", "cortina,gemini";

	compatible = "dlink,dns-313", "cortina,gemini";

	#address-cells = <1>;

	#size-cells = <1>;

arch/arm/boot/dts/imx6ul.dtsi

+4 −4
Original line number Diff line number Diff line
@@ -358,7 +358,7 @@ 
			pwm1: pwm@2080000 {

				compatible = "fsl,imx6ul-pwm", "fsl,imx27-pwm";

				reg = <0x02080000 0x4000>;

				interrupts = <GIC_SPI 115 IRQ_TYPE_LEVEL_HIGH>;

				interrupts = <GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>;

				clocks = <&clks IMX6UL_CLK_PWM1>,

					 <&clks IMX6UL_CLK_PWM1>;

				clock-names = "ipg", "per";
@@ -369,7 +369,7 @@ 
			pwm2: pwm@2084000 {

				compatible = "fsl,imx6ul-pwm", "fsl,imx27-pwm";

				reg = <0x02084000 0x4000>;

				interrupts = <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>;

				interrupts = <GIC_SPI 84 IRQ_TYPE_LEVEL_HIGH>;

				clocks = <&clks IMX6UL_CLK_PWM2>,

					 <&clks IMX6UL_CLK_PWM2>;

				clock-names = "ipg", "per";
@@ -380,7 +380,7 @@ 
			pwm3: pwm@2088000 {

				compatible = "fsl,imx6ul-pwm", "fsl,imx27-pwm";

				reg = <0x02088000 0x4000>;

				interrupts = <GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>;

				interrupts = <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>;

				clocks = <&clks IMX6UL_CLK_PWM3>,

					 <&clks IMX6UL_CLK_PWM3>;

				clock-names = "ipg", "per";
@@ -391,7 +391,7 @@ 
			pwm4: pwm@208c000 {

				compatible = "fsl,imx6ul-pwm", "fsl,imx27-pwm";

				reg = <0x0208c000 0x4000>;

				interrupts = <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>;

				interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>;

				clocks = <&clks IMX6UL_CLK_PWM4>,

					 <&clks IMX6UL_CLK_PWM4>;

				clock-names = "ipg", "per";