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

Commit 42c3c882 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 4.9.19 into android-4.9 



Changes in 4.9.19:
	net/openvswitch: Set the ipv6 source tunnel key address attribute correctly
	net: bcmgenet: Do not suspend PHY if Wake-on-LAN is enabled
	net: properly release sk_frag.page
	amd-xgbe: Fix jumbo MTU processing on newer hardware
	openvswitch: Add missing case OVS_TUNNEL_KEY_ATTR_PAD
	net: unix: properly re-increment inflight counter of GC discarded candidates
	qmi_wwan: add Dell DW5811e
	net: vrf: Reset rt6i_idev in local dst after put
	net/mlx5: Add missing entries for set/query rate limit commands
	net/mlx5e: Use the proper UAPI values when offloading TC vlan actions
	net/mlx5: Increase number of max QPs in default profile
	net/mlx5e: Count GSO packets correctly
	net/mlx5e: Count LRO packets correctly
	ipv6: make sure to initialize sockc.tsflags before first use
	net: bcmgenet: remove bcmgenet_internal_phy_setup()
	ipv4: provide stronger user input validation in nl_fib_input()
	socket, bpf: fix sk_filter use after free in sk_clone_lock
	tcp: initialize icsk_ack.lrcvtime at session start time
	Input: ALPS - fix V8+ protocol handling (73 03 28)
	Input: ALPS - fix trackstick button handling on V8 devices
	Input: elan_i2c - add ASUS EeeBook X205TA special touchpad fw
	Input: i8042 - add noloop quirk for Dell Embedded Box PC 3000
	Input: iforce - validate number of endpoints before using them
	Input: ims-pcu - validate number of endpoints before using them
	Input: hanwang - validate number of endpoints before using them
	Input: yealink - validate number of endpoints before using them
	Input: cm109 - validate number of endpoints before using them
	Input: kbtab - validate number of endpoints before using them
	Input: sur40 - validate number of endpoints before using them
	ALSA: seq: Fix racy cell insertions during snd_seq_pool_done()
	ALSA: ctxfi: Fix the incorrect check of dma_set_mask() call
	ALSA: hda - Adding a group of pin definition to fix headset problem
	USB: serial: option: add Quectel UC15, UC20, EC21, and EC25 modems
	USB: serial: qcserial: add Dell DW5811e
	ACM gadget: fix endianness in notifications
	usb: gadget: f_uvc: Fix SuperSpeed companion descriptor's wBytesPerInterval
	usb-core: Add LINEAR_FRAME_INTR_BINTERVAL USB quirk
	USB: uss720: fix NULL-deref at probe
	USB: lvtest: fix NULL-deref at probe
	USB: idmouse: fix NULL-deref at probe
	USB: wusbcore: fix NULL-deref at probe
	usb: musb: cppi41: don't check early-TX-interrupt for Isoch transfer
	usb: hub: Fix crash after failure to read BOS descriptor
	USB: usbtmc: add missing endpoint sanity check
	USB: usbtmc: fix probe error path
	uwb: i1480-dfu: fix NULL-deref at probe
	uwb: hwa-rc: fix NULL-deref at probe
	mmc: ushc: fix NULL-deref at probe
	iio: adc: ti_am335x_adc: fix fifo overrun recovery
	iio: sw-device: Fix config group initialization
	iio: hid-sensor-trigger: Change get poll value function order to avoid sensor properties losing after resume from S3
	iio: magnetometer: ak8974: remove incorrect __exit markups
	parport: fix attempt to write duplicate procfiles
	ext4: mark inode dirty after converting inline directory
	ext4: lock the xattr block before checksuming it
	powerpc/64s: Fix idle wakeup potential to clobber registers
	mmc: sdhci-of-at91: Support external regulators
	mmc: sdhci-of-arasan: fix incorrect timeout clock
	mmc: sdhci: Do not disable interrupts while waiting for clock
	mmc: sdhci-pci: Do not disable interrupts in sdhci_intel_set_power
	hwrng: amd - Revert managed API changes
	hwrng: geode - Revert managed API changes
	clk: sunxi-ng: sun6i: Fix enable bit offset for hdmi-ddc module clock
	clk: sunxi-ng: mp: Adjust parent rate for pre-dividers
	mwifiex: pcie: don't leak DMA buffers when removing
	crypto: ccp - Assign DMA commands to the channel's CCP
	xen/acpi: upload PM state from init-domain to Xen
	iommu/vt-d: Fix NULL pointer dereference in device_to_iommu
	Revert "ARM: at91/dt: sama5d2: Use new compatible for ohci node"
	ARM: at91: pm: cpu_idle: switch DDR to power-down mode
	arm64: kaslr: Fix up the kernel image alignment
	cpufreq: Restore policy min/max limits on CPU online
	cgroup, net_cls: iterate the fds of only the tasks which are being migrated
	blk-mq: don't complete un-started request in timeout handler
	drm/amdgpu: reinstate oland workaround for sclk
	auxdisplay: img-ascii-lcd: add missing sentinel entry in img_ascii_lcd_matches
	jbd2: don't leak memory if setting up journal fails
	intel_th: Don't leak module refcount on failure to activate
	Drivers: hv: vmbus: Don't leak channel ids
	Drivers: hv: vmbus: Don't leak memory when a channel is rescinded
	libceph: don't set weight to IN when OSD is destroyed
	device-dax: fix pmd/pte fault fallback handling
	drm/bridge: analogix dp: Fix runtime PM state on driver bind
	nl80211: fix dumpit error path RTNL deadlocks
	drm: reference count event->completion
	fbcon: Fix vc attr at deinit
	crypto: algif_hash - avoid zero-sized array
	Linux 4.9.19

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 6bf53d41 c8e13160

Makefile

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

PATCHLEVEL = 9

SUBLEVEL = 18

SUBLEVEL = 19

EXTRAVERSION =

NAME = Roaring Lionus

arch/arm/boot/dts/sama5d2.dtsi

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



		usb1: ohci@00400000 {

			compatible = "atmel,sama5d2-ohci", "usb-ohci";

			compatible = "atmel,at91rm9200-ohci", "usb-ohci";

			reg = <0x00400000 0x100000>;

			interrupts = <41 IRQ_TYPE_LEVEL_HIGH 2>;

			clocks = <&uhphs_clk>, <&uhphs_clk>, <&uhpck>;

arch/arm/mach-at91/pm.c

+17 −1
Original line number Diff line number Diff line
@@ -289,6 +289,22 @@ static void at91_ddr_standby(void) 
		at91_ramc_write(1, AT91_DDRSDRC_LPR, saved_lpr1);

}



static void sama5d3_ddr_standby(void)

{

	u32 lpr0;

	u32 saved_lpr0;



	saved_lpr0 = at91_ramc_read(0, AT91_DDRSDRC_LPR);

	lpr0 = saved_lpr0 & ~AT91_DDRSDRC_LPCB;

	lpr0 |= AT91_DDRSDRC_LPCB_POWER_DOWN;



	at91_ramc_write(0, AT91_DDRSDRC_LPR, lpr0);



	cpu_do_idle();



	at91_ramc_write(0, AT91_DDRSDRC_LPR, saved_lpr0);

}



/* We manage both DDRAM/SDRAM controllers, we need more than one value to

 * remember.

 */
@@ -323,7 +339,7 @@ static const struct of_device_id const ramc_ids[] __initconst = { 
	{ .compatible = "atmel,at91rm9200-sdramc", .data = at91rm9200_standby },

	{ .compatible = "atmel,at91sam9260-sdramc", .data = at91sam9_sdram_standby },

	{ .compatible = "atmel,at91sam9g45-ddramc", .data = at91_ddr_standby },

	{ .compatible = "atmel,sama5d3-ddramc", .data = at91_ddr_standby },

	{ .compatible = "atmel,sama5d3-ddramc", .data = sama5d3_ddr_standby },

	{ /*sentinel*/ }

};

arch/arm64/kernel/kaslr.c

+7 −3
Original line number Diff line number Diff line
@@ -131,11 +131,15 @@ u64 __init kaslr_early_init(u64 dt_phys, u64 modulo_offset) 
	/*

	 * The kernel Image should not extend across a 1GB/32MB/512MB alignment

	 * boundary (for 4KB/16KB/64KB granule kernels, respectively). If this

	 * happens, increase the KASLR offset by the size of the kernel image.

	 * happens, increase the KASLR offset by the size of the kernel image

	 * rounded up by SWAPPER_BLOCK_SIZE.

	 */

	if ((((u64)_text + offset + modulo_offset) >> SWAPPER_TABLE_SHIFT) !=

	    (((u64)_end + offset + modulo_offset) >> SWAPPER_TABLE_SHIFT))

		offset = (offset + (u64)(_end - _text)) & mask;

	    (((u64)_end + offset + modulo_offset) >> SWAPPER_TABLE_SHIFT)) {

		u64 kimg_sz = _end - _text;

		offset = (offset + round_up(kimg_sz, SWAPPER_BLOCK_SIZE))

				& mask;

	}



	if (IS_ENABLED(CONFIG_KASAN))

		/*

arch/powerpc/kernel/idle_book3s.S

+17 −3
Original line number Diff line number Diff line
@@ -439,9 +439,23 @@ END_FTR_SECTION_IFSET(CPU_FTR_ARCH_300) 
_GLOBAL(pnv_wakeup_tb_loss)

	ld	r1,PACAR1(r13)

	/*

	 * Before entering any idle state, the NVGPRs are saved in the stack

	 * and they are restored before switching to the process context. Hence

	 * until they are restored, they are free to be used.

	 * Before entering any idle state, the NVGPRs are saved in the stack.

	 * If there was a state loss, or PACA_NAPSTATELOST was set, then the

	 * NVGPRs are restored. If we are here, it is likely that state is lost,

	 * but not guaranteed -- neither ISA207 nor ISA300 tests to reach

	 * here are the same as the test to restore NVGPRS:

	 * PACA_THREAD_IDLE_STATE test for ISA207, PSSCR test for ISA300,

	 * and SRR1 test for restoring NVGPRs.

	 *

	 * We are about to clobber NVGPRs now, so set NAPSTATELOST to

	 * guarantee they will always be restored. This might be tightened

	 * with careful reading of specs (particularly for ISA300) but this

	 * is already a slow wakeup path and it's simpler to be safe.

	 */

	li	r0,1

	stb	r0,PACA_NAPSTATELOST(r13)



	/*

	 *

	 * Save SRR1 and LR in NVGPRs as they might be clobbered in

	 * opal_call() (called in CHECK_HMI_INTERRUPT). SRR1 is required