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

Commit c66b2190 authored by Alex Shi's avatar Alex Shi
Browse files

Merge tag 'v4.4.13' into linux-linaro-lsk-v4.4 

 This is the 4.4.13 stable release
parents 37aa27cf ba760d43

Documentation/devicetree/bindings/clock/imx35-clock.txt

+1 −0
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ clocks and IDs. 
	csi_sel			79

	iim_gate		80

	gpu2d_gate		81

	ckli_gate		82



Examples:

Documentation/sysctl/fs.txt

+23 −0
Original line number Diff line number Diff line
@@ -32,6 +32,8 @@ Currently, these files are in /proc/sys/fs: 
- nr_open

- overflowuid

- overflowgid

- pipe-user-pages-hard

- pipe-user-pages-soft

- protected_hardlinks

- protected_symlinks

- suid_dumpable
@@ -159,6 +161,27 @@ The default is 65534. 


==============================================================



pipe-user-pages-hard:



Maximum total number of pages a non-privileged user may allocate for pipes.

Once this limit is reached, no new pipes may be allocated until usage goes

below the limit again. When set to 0, no limit is applied, which is the default

setting.



==============================================================



pipe-user-pages-soft:



Maximum total number of pages a non-privileged user may allocate for pipes

before the pipe size gets limited to a single page. Once this limit is reached,

new pipes will be limited to a single page in size for this user in order to

limit total memory usage, and trying to increase them using fcntl() will be

denied until usage goes below the limit again. The default value allows to

allocate up to 1024 pipes at their default size. When set to 0, no limit is

applied.



==============================================================



protected_hardlinks:



A long-standing class of security issues is the hardlink-based

Makefile

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

PATCHLEVEL = 4

SUBLEVEL = 12

SUBLEVEL = 13

EXTRAVERSION =

NAME = Blurry Fish Butt
@@ -364,7 +364,7 @@ AFLAGS_MODULE = 
LDFLAGS_MODULE  =

CFLAGS_KERNEL	=

AFLAGS_KERNEL	=

CFLAGS_GCOV	= -fprofile-arcs -ftest-coverage

CFLAGS_GCOV	= -fprofile-arcs -ftest-coverage -fno-tree-loop-im





# Use USERINCLUDE when you must reference the UAPI directories only.

arch/arm/boot/dts/armada-385-linksys.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -245,7 +245,7 @@ 
		button@2 {

			label = "Factory Reset Button";

			linux,code = <KEY_RESTART>;

			gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;

			gpios = <&gpio0 29 GPIO_ACTIVE_LOW>;

		};

	};
@@ -260,7 +260,7 @@ 
		};



		sata {

			gpios = <&gpio1 22 GPIO_ACTIVE_HIGH>;

			gpios = <&gpio1 22 GPIO_ACTIVE_LOW>;

			default-state = "off";

		};

	};
@@ -313,7 +313,7 @@ 


&pinctrl {

	keys_pin: keys-pin {

		marvell,pins = "mpp24", "mpp47";

		marvell,pins = "mpp24", "mpp29";

		marvell,function = "gpio";

	};

arch/arm/boot/dts/armada-xp-linksys-mamba.dts

+2 −2
Original line number Diff line number Diff line
@@ -304,13 +304,13 @@ 
		button@1 {

			label = "WPS";

			linux,code = <KEY_WPS_BUTTON>;

			gpios = <&gpio1 0 GPIO_ACTIVE_HIGH>;

			gpios = <&gpio1 0 GPIO_ACTIVE_LOW>;

		};



		button@2 {

			label = "Factory Reset Button";

			linux,code = <KEY_RESTART>;

			gpios = <&gpio1 1 GPIO_ACTIVE_HIGH>;

			gpios = <&gpio1 1 GPIO_ACTIVE_LOW>;

		};

	};