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

Commit 6c02278d authored by Blagovest Kolenichev's avatar Blagovest Kolenichev
Browse files

Merge android-4.9.91 (bb94f9d8) into msm-4.9 



* refs/heads/tmp-bb94f9d8:
  UPSTREAM: net: hns: Fix a skb used after free bug
  Linux 4.9.91
  bpf, x64: increase number of passes
  bpf: skip unnecessary capability check
  kbuild: disable clang's default use of -fmerge-all-constants
  selftests: x86: sysret_ss_attrs doesn't build on a PIE build
  x86/pkeys/selftests: Rename 'si_pkey' to 'siginfo_pkey'
  signal/testing: Don't look for __SI_FAULT in userspace
  selftests/x86/protection_keys: Fix syscall NR redefinition warnings
  selftests, x86, protection_keys: fix wrong offset in siginfo
  staging: lustre: ptlrpc: kfree used instead of kvfree
  iio: ABI: Fix name of timestamp sysfs file
  perf/x86/intel/uncore: Fix multi-domain PCI CHA enumeration bug on Skylake servers
  perf/x86/intel: Don't accidentally clear high bits in bdw_limit_period()
  perf stat: Fix CVS output format for non-supported counters
  perf/x86/intel/uncore: Fix Skylake UPI event format
  x86/entry/64: Don't use IST entry for #BP stack
  x86/boot/64: Verify alignment of the LOAD segment
  x86/build/64: Force the linker to use 2MB page size
  kvm/x86: fix icebp instruction handling
  selftests/x86/ptrace_syscall: Fix for yet more glibc interference
  tty: vt: fix up tabstops properly
  can: cc770: Fix use after free in cc770_tx_interrupt()
  can: cc770: Fix queue stall & dropped RTR reply
  can: cc770: Fix stalls on rt-linux, remove redundant IRQ ack
  can: ifi: Check core revision upon probe
  can: ifi: Repair the error handling
  staging: ncpfs: memory corruption in ncp_read_kernel()
  mtd: nand: fsl_ifc: Read ECCSTAT0 and ECCSTAT1 registers for IFC 2.0
  mtd: nand: fsl_ifc: Fix eccstat array overflow for IFC ver >= 2.0.0
  mtd: nand: fsl_ifc: Fix nand waitfunc return value
  mtdchar: fix usage of mtd_ooblayout_ecc()
  tracing: probeevent: Fix to support minus offset from symbol
  rtlwifi: rtl8723be: Fix loss of signal
  brcmfmac: fix P2P_DEVICE ethernet address generation
  libnvdimm, {btt, blk}: do integrity setup before add_disk()
  ACPI / watchdog: Fix off-by-one error at resource assignment
  acpi, numa: fix pxm to online numa node associations
  drm: udl: Properly check framebuffer mmap offsets
  drm/radeon: Don't turn off DP sink when disconnected
  drm/vmwgfx: Fix a destoy-while-held mutex problem.
  mm/shmem: do not wait for lock_page() in shmem_unused_huge_shrink()
  mm/thp: do not wait for lock_page() in deferred_split_scan()
  mm/khugepaged.c: convert VM_BUG_ON() to collapse fail
  x86/mm: implement free pmd/pte page interfaces
  mm/vmalloc: add interfaces to free unmapped page table
  nfsd: remove blocked locks on client teardown
  libata: Modify quirks for MX100 to limit NCQ_TRIM quirk to MU01 version
  libata: Make Crucial BX100 500GB LPM quirk apply to all firmware versions
  libata: Apply NOLPM quirk to Crucial M500 480 and 960GB SSDs
  libata: Enable queued TRIM for Samsung SSD 860
  libata: disable LPM for Crucial BX100 SSD 500GB drive
  libata: Apply NOLPM quirk to Crucial MX100 512GB SSDs
  libata: don't try to pass through NCQ commands to non-NCQ devices
  libata: remove WARN() for DMA or PIO command without data
  libata: fix length validation of ATAPI-relayed SCSI commands
  Bluetooth: btusb: Fix quirk for Atheros 1525/QCA6174
  clk: sunxi-ng: a31: Fix CLK_OUT_* clock ops
  clk: bcm2835: Protect sections updating shared registers
  clk: bcm2835: Fix ana->maskX definitions
  ahci: Add PCI-id for the Highpoint Rocketraid 644L card
  PCI: Add function 1 DMA alias quirk for Highpoint RocketRAID 644L
  mmc: dw_mmc: fix falling from idmac to PIO mode when dw_mci_reset occurs
  ALSA: hda/realtek - Always immediately update mute LED with pin VREF
  ALSA: aloop: Fix access to not-yet-ready substream via cable
  ALSA: aloop: Sync stale timer before release
  ALSA: usb-audio: Fix parsing descriptor of UAC2 processing unit
  iio: st_pressure: st_accel: pass correct platform data to init
  MIPS: ralink: Remove ralink_halt()

Change-Id: I65d15215fbd73a86b6834aad1d7280b8dc16b62b
Signed-off-by: default avatarBlagovest Kolenichev <bkolenichev@codeaurora.org>
parents dc9767ff bb94f9d8

Documentation/ABI/testing/sysfs-bus-iio

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ Description: 
		Description of the physical chip / device for device X.

		Typically a part number.



What:		/sys/bus/iio/devices/iio:deviceX/timestamp_clock

What:		/sys/bus/iio/devices/iio:deviceX/current_timestamp_clock

KernelVersion:	4.5

Contact:	linux-iio@vger.kernel.org

Description:

Makefile

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

PATCHLEVEL = 9

SUBLEVEL = 90

SUBLEVEL = 91

EXTRAVERSION =

NAME = Roaring Lionus
@@ -870,6 +870,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

+10 −0
Original line number Diff line number Diff line
@@ -861,3 +861,13 @@ int pmd_clear_huge(pmd_t *pmd) 
	pmd_clear(pmd);

	return 1;

}



int pud_free_pmd_page(pud_t *pud)

{

	return pud_none(*pud);

}



int pmd_free_pte_page(pmd_t *pmd)

{

	return pmd_none(*pmd);

}

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
@@ -193,6 +193,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