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

Commit 571949a4 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 4.12-rc6 into usb-next 



We want the USB fixes in here.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parents 21bdb3b0 41f1830f

Documentation/admin-guide/kernel-parameters.txt

+7 −0
Original line number Diff line number Diff line
@@ -3811,6 +3811,13 @@ 
			expediting.  Set to zero to disable automatic

			expediting.



	stack_guard_gap=	[MM]

			override the default stack gap protection. The value

			is in page units and it defines how many pages prior

			to (for stacks growing down) resp. after (for stacks

			growing up) the main stack are reserved for no other

			mapping. Default value is 256 pages.



	stacktrace	[FTRACE]

			Enabled the stack tracer on boot up.

Documentation/networking/scaling.txt

+1 −1
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ associated flow of the packet. The hash is either provided by hardware 
or will be computed in the stack. Capable hardware can pass the hash in

the receive descriptor for the packet; this would usually be the same

hash used for RSS (e.g. computed Toeplitz hash). The hash is saved in

skb->rx_hash and can be used elsewhere in the stack as a hash of the

skb->hash and can be used elsewhere in the stack as a hash of the

packet’s flow.



Each receive hardware queue has an associated list of CPUs to which

Makefile

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

PATCHLEVEL = 12

SUBLEVEL = 0

EXTRAVERSION = -rc5

EXTRAVERSION = -rc6

NAME = Fearless Coyote



# *DOCUMENTATION*

arch/arc/mm/mmap.c

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr, 


		vma = find_vma(mm, addr);

		if (TASK_SIZE - len >= addr &&

		    (!vma || addr + len <= vma->vm_start))

		    (!vma || addr + len <= vm_start_gap(vma)))

			return addr;

	}

arch/arm/boot/dts/am335x-sl50.dts

+2 −6
Original line number Diff line number Diff line
@@ -220,7 +220,7 @@ 


	mmc1_pins: pinmux_mmc1_pins {

		pinctrl-single,pins = <

			AM33XX_IOPAD(0x960, PIN_INPUT | MUX_MODE7)		/* spi0_cs1.gpio0_6 */

			AM33XX_IOPAD(0x96c, PIN_INPUT | MUX_MODE7)		/* uart0_rtsn.gpio1_9 */

		>;

	};
@@ -280,10 +280,6 @@ 
			AM33XX_IOPAD(0x834, PIN_INPUT_PULLUP | MUX_MODE7)	/* nKbdReset - gpmc_ad13.gpio1_13 */

			AM33XX_IOPAD(0x838, PIN_INPUT_PULLUP | MUX_MODE7)	/* nDispReset - gpmc_ad14.gpio1_14 */

			AM33XX_IOPAD(0x844, PIN_INPUT_PULLUP | MUX_MODE7)	/* USB1_enPower - gpmc_a1.gpio1_17 */

			/* AVR Programming - SPI Bus (bit bang) - Screen and Keyboard */

			AM33XX_IOPAD(0x954, PIN_INPUT_PULLUP | MUX_MODE7)	/* Kbd/Disp/BattMOSI spi0_d0.gpio0_3 */

			AM33XX_IOPAD(0x958, PIN_INPUT_PULLUP | MUX_MODE7)	/* Kbd/Disp/BattMISO spi0_d1.gpio0_4 */

			AM33XX_IOPAD(0x950, PIN_INPUT_PULLUP | MUX_MODE7)	/* Kbd/Disp/BattSCLK spi0_clk.gpio0_2 */

			/* PDI Bus - Battery system */

			AM33XX_IOPAD(0x840, PIN_INPUT_PULLUP | MUX_MODE7)	/* nBattReset  gpmc_a0.gpio1_16 */

			AM33XX_IOPAD(0x83c, PIN_INPUT_PULLUP | MUX_MODE7)	/* BattPDIData gpmc_ad15.gpio1_15 */
@@ -384,7 +380,7 @@ 
	pinctrl-names = "default";

	pinctrl-0 = <&mmc1_pins>;

	bus-width = <4>;

	cd-gpios = <&gpio0 6 GPIO_ACTIVE_LOW>;

	cd-gpios = <&gpio1 9 GPIO_ACTIVE_LOW>;

	vmmc-supply = <&vmmcsd_fixed>;

};