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

Commit 8565d26b 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 BPF verifier conflict was some minor contextual issue.

The TUN conflict was less trivial.  Cong Wang fixed a memory leak of
tfile->tx_array in 'net'.  This is an skb_array.  But meanwhile in
net-next tun changed tfile->tx_arry into tfile->tx_ring which is a
ptr_ring.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 85831e56 ec835f81

arch/arm/boot/dts/da850-lcdk.dts

+2 −2
Original line number Diff line number Diff line
@@ -293,12 +293,12 @@ 
					label = "u-boot env";

					reg = <0 0x020000>;

				};

				partition@0x020000 {

				partition@20000 {

					/* The LCDK defaults to booting from this partition */

					label = "u-boot";

					reg = <0x020000 0x080000>;

				};

				partition@0x0a0000 {

				partition@a0000 {

					label = "free space";

					reg = <0x0a0000 0>;

				};

arch/arm/boot/dts/kirkwood-openblocks_a7.dts

+8 −2
Original line number Diff line number Diff line
@@ -53,7 +53,8 @@ 
		};



		pinctrl: pin-controller@10000 {

			pinctrl-0 = <&pmx_dip_switches &pmx_gpio_header>;

			pinctrl-0 = <&pmx_dip_switches &pmx_gpio_header

				     &pmx_gpio_header_gpo>;

			pinctrl-names = "default";



			pmx_uart0: pmx-uart0 {
@@ -85,11 +86,16 @@ 
			 * ground.

			 */

			pmx_gpio_header: pmx-gpio-header {

				marvell,pins = "mpp17", "mpp7", "mpp29", "mpp28",

				marvell,pins = "mpp17", "mpp29", "mpp28",

					       "mpp35", "mpp34", "mpp40";

				marvell,function = "gpio";

			};



			pmx_gpio_header_gpo: pxm-gpio-header-gpo {

				marvell,pins = "mpp7";

				marvell,function = "gpo";

			};



			pmx_gpio_init: pmx-init {

				marvell,pins = "mpp38";

				marvell,function = "gpio";

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

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


					be1_out_tcon0: endpoint@0 {

						reg = <0>;

						remote-endpoint = <&tcon1_in_be0>;

						remote-endpoint = <&tcon0_in_be1>;

					};



					be1_out_tcon1: endpoint@1 {

arch/arm/boot/dts/sun7i-a20.dtsi

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


					be1_out_tcon0: endpoint@0 {

						reg = <0>;

						remote-endpoint = <&tcon1_in_be0>;

						remote-endpoint = <&tcon0_in_be1>;

					};



					be1_out_tcon1: endpoint@1 {

arch/arm/configs/sunxi_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ CONFIG_SMP=y 
CONFIG_NR_CPUS=8

CONFIG_AEABI=y

CONFIG_HIGHMEM=y

CONFIG_CMA=y

CONFIG_ARM_APPENDED_DTB=y

CONFIG_ARM_ATAG_DTB_COMPAT=y

CONFIG_CPU_FREQ=y
@@ -33,6 +34,7 @@ CONFIG_CAN_SUN4I=y 
# CONFIG_WIRELESS is not set

CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_MOUNT=y

CONFIG_DMA_CMA=y

CONFIG_BLK_DEV_SD=y

CONFIG_ATA=y

CONFIG_AHCI_SUNXI=y