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

Commit 8cbe01c6 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 4.4.109 into android-4.4 



Changes in 4.4.109
	ACPI: APEI / ERST: Fix missing error handling in erst_reader()
	crypto: mcryptd - protect the per-CPU queue with a lock
	mfd: cros ec: spi: Don't send first message too soon
	mfd: twl4030-audio: Fix sibling-node lookup
	mfd: twl6040: Fix child-node lookup
	ALSA: rawmidi: Avoid racy info ioctl via ctl device
	ALSA: usb-audio: Fix the missing ctl name suffix at parsing SU
	PCI / PM: Force devices to D0 in pci_pm_thaw_noirq()
	parisc: Hide Diva-built-in serial aux and graphics card
	spi: xilinx: Detect stall with Unknown commands
	KVM: X86: Fix load RFLAGS w/o the fixed bit
	kvm: x86: fix RSM when PCID is non-zero
	powerpc/perf: Dereference BHRB entries safely
	net: mvneta: clear interface link status on port disable
	tracing: Remove extra zeroing out of the ring buffer page
	tracing: Fix possible double free on failure of allocating trace buffer
	tracing: Fix crash when it fails to alloc ring buffer
	ring-buffer: Mask out the info bits when returning buffer page length
	iw_cxgb4: Only validate the MSN for successful completions
	ASoC: fsl_ssi: AC'97 ops need regmap, clock and cleaning up on failure
	ASoC: twl4030: fix child-node lookup
	ALSA: hda: Drop useless WARN_ON()
	ALSA: hda - fix headset mic detection issue on a Dell machine
	x86/vm86/32: Switch to flush_tlb_mm_range() in mark_screen_rdonly()
	x86/mm: Remove flush_tlb() and flush_tlb_current_task()
	x86/mm: Make flush_tlb_mm_range() more predictable
	x86/mm: Reimplement flush_tlb_page() using flush_tlb_mm_range()
	x86/mm: Remove the UP asm/tlbflush.h code, always use the (formerly) SMP code
	x86/mm: Disable PCID on 32-bit kernels
	x86/mm: Add the 'nopcid' boot option to turn off PCID
	x86/mm: Enable CR4.PCIDE on supported systems
	x86/mm/64: Fix reboot interaction with CR4.PCIDE
	kbuild: add '-fno-stack-check' to kernel build options
	ipv4: igmp: guard against silly MTU values
	ipv6: mcast: better catch silly mtu values
	net: igmp: Use correct source address on IGMPv3 reports
	netlink: Add netns check on taps
	net: qmi_wwan: add Sierra EM7565 1199:9091
	net: reevalulate autoflowlabel setting after sysctl setting
	tcp md5sig: Use skb's saddr when replying to an incoming segment
	tg3: Fix rx hang on MTU change with 5717/5719
	net: ipv4: fix for a race condition in raw_sendmsg
	net: mvmdio: disable/unprepare clocks in EPROBE_DEFER case
	sctp: Replace use of sockets_allocated with specified macro.
	ipv4: Fix use-after-free when flushing FIB tables
	net: bridge: fix early call to br_stp_change_bridge_id and plug newlink leaks
	net: Fix double free and memory corruption in get_net_ns_by_id()
	net: phy: micrel: ksz9031: reconfigure autoneg after phy autoneg workaround
	sock: free skb in skb_complete_tx_timestamp on error
	usbip: fix usbip bind writing random string after command in match_busid
	usbip: stub: stop printing kernel pointer addresses in messages
	usbip: vhci: stop printing kernel pointer addresses in messages
	USB: serial: ftdi_sio: add id for Airbus DS P8GR
	USB: serial: qcserial: add Sierra Wireless EM7565
	USB: serial: option: add support for Telit ME910 PID 0x1101
	USB: serial: option: adding support for YUGA CLM920-NC5
	usb: Add device quirk for Logitech HD Pro Webcam C925e
	usb: add RESET_RESUME for ELSA MicroLink 56K
	USB: Fix off by one in type-specific length check of BOS SSP capability
	usb: xhci: Add XHCI_TRUST_TX_LENGTH for Renesas uPD720201
	nohz: Prevent a timer interrupt storm in tick_nohz_stop_sched_tick()
	x86/smpboot: Remove stale TLB flush invocations
	n_tty: fix EXTPROC vs ICANON interaction with TIOCINQ (aka FIONREAD)
	mm/vmstat: Make NR_TLB_REMOTE_FLUSH_RECEIVED available even on UP
	Linux 4.4.109

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 55b3b8c2 e68d6189

Documentation/kernel-parameters.txt

+2 −0
Original line number Diff line number Diff line
@@ -2561,6 +2561,8 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
	nopat		[X86] Disable PAT (page attribute table extension of

			pagetables) support.



	nopcid		[X86-64] Disable the PCID cpu feature.



	norandmaps	Don't use address space randomization.  Equivalent to

			echo 0 > /proc/sys/kernel/randomize_va_space

Makefile

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

PATCHLEVEL = 4

SUBLEVEL = 108

SUBLEVEL = 109

EXTRAVERSION =

NAME = Blurry Fish Butt
@@ -804,6 +804,9 @@ KBUILD_CFLAGS += $(call cc-disable-warning, pointer-sign) 
# disable invalid "can't wrap" optimizations for signed / pointers

KBUILD_CFLAGS	+= $(call cc-option,-fno-strict-overflow)



# Make sure -fstack-check isn't enabled (like gentoo apparently did)

KBUILD_CFLAGS  += $(call cc-option,-fno-stack-check,)



# conserve stack if available

KBUILD_CFLAGS   += $(call cc-option,-fconserve-stack)

arch/powerpc/perf/core-book3s.c

+6 −2
Original line number Diff line number Diff line
@@ -401,8 +401,12 @@ static __u64 power_pmu_bhrb_to(u64 addr) 
	int ret;

	__u64 target;



	if (is_kernel_addr(addr))

		return branch_target((unsigned int *)addr);

	if (is_kernel_addr(addr)) {

		if (probe_kernel_read(&instr, (void *)addr, sizeof(instr)))

			return 0;



		return branch_target(&instr);

	}



	/* Userspace: need copy instruction here then translate it */

	pagefault_disable();

arch/x86/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ config X86 
	select ARCH_USE_CMPXCHG_LOCKREF		if X86_64

	select ARCH_USE_QUEUED_RWLOCKS

	select ARCH_USE_QUEUED_SPINLOCKS

	select ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH if SMP

	select ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH

	select ARCH_WANTS_DYNAMIC_TASK_STRUCT

	select ARCH_WANT_FRAME_POINTERS

	select ARCH_WANT_IPC_PARSE_VERSION	if X86_32

arch/x86/include/asm/disabled-features.h

+3 −1
Original line number Diff line number Diff line
@@ -21,11 +21,13 @@ 
# define DISABLE_K6_MTRR	(1<<(X86_FEATURE_K6_MTRR & 31))

# define DISABLE_CYRIX_ARR	(1<<(X86_FEATURE_CYRIX_ARR & 31))

# define DISABLE_CENTAUR_MCR	(1<<(X86_FEATURE_CENTAUR_MCR & 31))

# define DISABLE_PCID		0

#else

# define DISABLE_VME		0

# define DISABLE_K6_MTRR	0

# define DISABLE_CYRIX_ARR	0

# define DISABLE_CENTAUR_MCR	0

# define DISABLE_PCID		(1<<(X86_FEATURE_PCID & 31))

#endif /* CONFIG_X86_64 */



/*
@@ -35,7 +37,7 @@ 
#define DISABLED_MASK1	0

#define DISABLED_MASK2	0

#define DISABLED_MASK3	(DISABLE_CYRIX_ARR|DISABLE_CENTAUR_MCR|DISABLE_K6_MTRR)

#define DISABLED_MASK4	0

#define DISABLED_MASK4	(DISABLE_PCID)

#define DISABLED_MASK5	0

#define DISABLED_MASK6	0

#define DISABLED_MASK7	0