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

Commit 38f41ec1 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 4.4.125 into android-4.4 



Changes in 4.4.125
	MIPS: ralink: Remove ralink_halt()
	iio: st_pressure: st_accel: pass correct platform data to init
	ALSA: usb-audio: Fix parsing descriptor of UAC2 processing unit
	ALSA: aloop: Sync stale timer before release
	ALSA: aloop: Fix access to not-yet-ready substream via cable
	ALSA: hda/realtek - Always immediately update mute LED with pin VREF
	mmc: dw_mmc: fix falling from idmac to PIO mode when dw_mci_reset occurs
	PCI: Add function 1 DMA alias quirk for Highpoint RocketRAID 644L
	ahci: Add PCI-id for the Highpoint Rocketraid 644L card
	clk: bcm2835: Protect sections updating shared registers
	Bluetooth: btusb: Fix quirk for Atheros 1525/QCA6174
	libata: fix length validation of ATAPI-relayed SCSI commands
	libata: remove WARN() for DMA or PIO command without data
	libata: Apply NOLPM quirk to Crucial MX100 512GB SSDs
	libata: disable LPM for Crucial BX100 SSD 500GB drive
	libata: Enable queued TRIM for Samsung SSD 860
	libata: Apply NOLPM quirk to Crucial M500 480 and 960GB SSDs
	libata: Make Crucial BX100 500GB LPM quirk apply to all firmware versions
	libata: Modify quirks for MX100 to limit NCQ_TRIM quirk to MU01 version
	mm/vmalloc: add interfaces to free unmapped page table
	x86/mm: implement free pmd/pte page interfaces
	drm/vmwgfx: Fix a destoy-while-held mutex problem.
	drm/radeon: Don't turn off DP sink when disconnected
	drm: udl: Properly check framebuffer mmap offsets
	acpi, numa: fix pxm to online numa node associations
	brcmfmac: fix P2P_DEVICE ethernet address generation
	rtlwifi: rtl8723be: Fix loss of signal
	tracing: probeevent: Fix to support minus offset from symbol
	mtd: nand: fsl_ifc: Fix nand waitfunc return value
	staging: ncpfs: memory corruption in ncp_read_kernel()
	can: cc770: Fix stalls on rt-linux, remove redundant IRQ ack
	can: cc770: Fix queue stall & dropped RTR reply
	can: cc770: Fix use after free in cc770_tx_interrupt()
	tty: vt: fix up tabstops properly
	kvm/x86: fix icebp instruction handling
	x86/build/64: Force the linker to use 2MB page size
	x86/boot/64: Verify alignment of the LOAD segment
	x86/entry/64: Don't use IST entry for #BP stack
	perf/x86/intel: Don't accidentally clear high bits in bdw_limit_period()
	staging: lustre: ptlrpc: kfree used instead of kvfree
	kbuild: disable clang's default use of -fmerge-all-constants
	bpf: skip unnecessary capability check
	bpf, x64: increase number of passes
	Linux 4.4.125

Change-Id: I14b307cd27ff088800174c74819a3ff1790b41ce
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 49632c6d aec8e72e

Makefile

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

PATCHLEVEL = 4

SUBLEVEL = 124

SUBLEVEL = 125

EXTRAVERSION =

NAME = Blurry Fish Butt
@@ -806,6 +806,15 @@ 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)



# clang sets -fmerge-all-constants by default as optimization, but this

# is non-conforming behavior for C and in fact breaks the kernel, so we

# need to disable it here generally.

KBUILD_CFLAGS	+= $(call cc-option,-fno-merge-all-constants)



# for gcc -fno-merge-all-constants disables everything, but it is fine

# to have actual conforming behavior enabled.

KBUILD_CFLAGS	+= $(call cc-option,-fmerge-constants)



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

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

arch/arm64/mm/mmu.c

+12 −0
Original line number Diff line number Diff line
@@ -892,3 +892,15 @@ int pmd_clear_huge(pmd_t *pmd) 
	pmd_clear(pmd);

	return 1;

}



#ifdef CONFIG_HAVE_ARCH_HUGE_VMAP

int pud_free_pmd_page(pud_t *pud)

{

	return pud_none(*pud);

}



int pmd_free_pte_page(pmd_t *pmd)

{

	return pmd_none(*pmd);

}

#endif

arch/mips/ralink/reset.c

+0 −7
Original line number Diff line number Diff line
@@ -96,16 +96,9 @@ static void ralink_restart(char *command) 
	unreachable();

}



static void ralink_halt(void)

{

	local_irq_disable();

	unreachable();

}



static int __init mips_reboot_setup(void)

{

	_machine_restart = ralink_restart;

	_machine_halt = ralink_halt;



	return 0;

}

arch/x86/Makefile

+9 −0
Original line number Diff line number Diff line
@@ -200,6 +200,15 @@ KBUILD_CFLAGS += $(cfi) $(cfi-sigframe) $(cfi-sections) $(asinstr) $(avx_instr) 


LDFLAGS := -m elf_$(UTS_MACHINE)



#

# The 64-bit kernel must be aligned to 2MB.  Pass -z max-page-size=0x200000 to

# the linker to force 2MB page size regardless of the default page size used

# by the linker.

#

ifdef CONFIG_X86_64

LDFLAGS += $(call ld-option, -z max-page-size=0x200000)

endif



# Speed up the build

KBUILD_CFLAGS += -pipe

# Workaround for a gcc prelease that unfortunately was shipped in a suse release

arch/x86/boot/compressed/misc.c

+4 −0
Original line number Diff line number Diff line
@@ -366,6 +366,10 @@ static void parse_elf(void *output) 


		switch (phdr->p_type) {

		case PT_LOAD:

#ifdef CONFIG_X86_64

			if ((phdr->p_align % 0x200000) != 0)

				error("Alignment of LOAD segment isn't multiple of 2MB");

#endif

#ifdef CONFIG_RELOCATABLE

			dest = output;

			dest += (phdr->p_paddr - LOAD_PHYSICAL_ADDR);