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

Commit 0a29b0a6 authored by Kyle Yan's avatar Kyle Yan Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Merge remote-tracking branch 'origin/tmp-69973b83' into msm-4.8" into msm-4.8

parents 52b53aca f37d2ac4

Makefile

+2 −2
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 9

SUBLEVEL = 0

EXTRAVERSION = -rc8

NAME = Psychotic Stoned Sheep

EXTRAVERSION =

NAME = Roaring Lionus



# *DOCUMENTATION*

# To see a list of typical targets execute "make help"

arch/arm/boot/dts/imx7s.dtsi

+2 −3
Original line number Diff line number Diff line
@@ -643,9 +643,8 @@ 
				reg = <0x30730000 0x10000>;

				interrupts = <GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>;

				clocks = <&clks IMX7D_LCDIF_PIXEL_ROOT_CLK>,

					<&clks IMX7D_CLK_DUMMY>,

					<&clks IMX7D_CLK_DUMMY>;

				clock-names = "pix", "axi", "disp_axi";

					<&clks IMX7D_LCDIF_PIXEL_ROOT_CLK>;

				clock-names = "pix", "axi";

				status = "disabled";

			};

		};

arch/arm/boot/dts/orion5x-linkstation-lsgl.dts

+4 −0
Original line number Diff line number Diff line
@@ -82,6 +82,10 @@ 
	gpios = <&gpio0 9 GPIO_ACTIVE_HIGH>;

};



&sata {

	nr-ports = <2>;

};



&ehci1 {

	status = "okay";

};

arch/arm/boot/dts/sun8i-h3.dtsi

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



			uart3_pins: uart3 {

				allwinner,pins = "PG13", "PG14";

				allwinner,pins = "PA13", "PA14";

				allwinner,function = "uart3";

				allwinner,drive = <SUN4I_PINCTRL_10_MA>;

				allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;

arch/m68k/configs/amiga_defconfig

+6 −2
Original line number Diff line number Diff line
@@ -95,9 +95,10 @@ CONFIG_NF_TABLES_INET=m 
CONFIG_NF_TABLES_NETDEV=m

CONFIG_NFT_EXTHDR=m

CONFIG_NFT_META=m

CONFIG_NFT_NUMGEN=m

CONFIG_NFT_CT=m

CONFIG_NFT_RBTREE=m

CONFIG_NFT_HASH=m

CONFIG_NFT_SET_RBTREE=m

CONFIG_NFT_SET_HASH=m

CONFIG_NFT_COUNTER=m

CONFIG_NFT_LOG=m

CONFIG_NFT_LIMIT=m
@@ -105,8 +106,10 @@ CONFIG_NFT_MASQ=m 
CONFIG_NFT_REDIR=m

CONFIG_NFT_NAT=m

CONFIG_NFT_QUEUE=m

CONFIG_NFT_QUOTA=m

CONFIG_NFT_REJECT=m

CONFIG_NFT_COMPAT=m

CONFIG_NFT_HASH=m

CONFIG_NFT_DUP_NETDEV=m

CONFIG_NFT_FWD_NETDEV=m

CONFIG_NETFILTER_XT_SET=m
@@ -366,6 +369,7 @@ CONFIG_NETCONSOLE=m 
CONFIG_NETCONSOLE_DYNAMIC=y

CONFIG_VETH=m

# CONFIG_NET_VENDOR_3COM is not set

# CONFIG_NET_VENDOR_AMAZON is not set

CONFIG_A2065=y

CONFIG_ARIADNE=y

# CONFIG_NET_VENDOR_ARC is not set