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

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

Merge 4.9.153 into android-4.9 



Changes in 4.9.153
	r8169: Add support for new Realtek Ethernet
	ipv6: Consider sk_bound_dev_if when binding a socket to a v4 mapped address
	ipv6: Take rcu_read_lock in __inet6_bind for mapped addresses
	platform/x86: asus-wmi: Tell the EC the OS will handle the display off hotkey
	e1000e: allow non-monotonic SYSTIM readings
	writeback: don't decrement wb->refcnt if !wb->bdi
	serial: set suppress_bind_attrs flag only if builtin
	ALSA: oxfw: add support for APOGEE duet FireWire
	MIPS: SiByte: Enable swiotlb for SWARM, LittleSur and BigSur
	arm64: perf: set suppress_bind_attrs flag to true
	selinux: always allow mounting submounts
	rxe: IB_WR_REG_MR does not capture MR's iova field
	jffs2: Fix use of uninitialized delayed_work, lockdep breakage
	pstore/ram: Do not treat empty buffers as valid
	powerpc/xmon: Fix invocation inside lock region
	powerpc/pseries/cpuidle: Fix preempt warning
	media: firewire: Fix app_info parameter type in avc_ca{,_app}_info
	net: call sk_dst_reset when set SO_DONTROUTE
	scsi: target: use consistent left-aligned ASCII INQUIRY data
	clk: imx6q: reset exclusive gates on init
	kconfig: fix file name and line number of warn_ignored_character()
	kconfig: fix memory leak when EOF is encountered in quotation
	mmc: atmel-mci: do not assume idle after atmci_request_end
	tty/serial: do not free trasnmit buffer page under port lock
	perf intel-pt: Fix error with config term "pt=0"
	perf svghelper: Fix unchecked usage of strncpy()
	perf parse-events: Fix unchecked usage of strncpy()
	dm kcopyd: Fix bug causing workqueue stalls
	tools lib subcmd: Don't add the kernel sources to the include path
	dm snapshot: Fix excessive memory usage and workqueue stalls
	ALSA: bebob: fix model-id of unit for Apogee Ensemble
	sysfs: Disable lockdep for driver bind/unbind files
	scsi: smartpqi: correct lun reset issues
	scsi: megaraid: fix out-of-bound array accesses
	ocfs2: fix panic due to unrecovered local alloc
	mm/page-writeback.c: don't break integrity writeback on ->writepage() error
	mm, proc: be more verbose about unstable VMA flags in /proc/<pid>/smaps
	ipmi:ssif: Fix handling of multi-part return messages
	locking/qspinlock: Pull in asm/byteorder.h to ensure correct endianness
	Linux 4.9.153

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 046daa57 189b75ad

Documentation/filesystems/proc.txt

+3 −1
Original line number Diff line number Diff line
@@ -487,7 +487,9 @@ manner. The codes are the following: 


Note that there is no guarantee that every flag and associated mnemonic will

be present in all further kernel releases. Things get changed, the flags may

be vanished or the reverse -- new added.

be vanished or the reverse -- new added. Interpretation of their meaning

might change in future as well. So each consumer of these flags has to

follow each specific kernel version for the exact semantic.



The "Name" field will only be present on a mapping that has been named by

userspace, and will show the name passed in by userspace.

Makefile

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

PATCHLEVEL = 9

SUBLEVEL = 152

SUBLEVEL = 153

EXTRAVERSION =

NAME = Roaring Lionus

arch/arm64/kernel/perf_event.c

+1 −0
Original line number Diff line number Diff line
@@ -1114,6 +1114,7 @@ static struct platform_driver armv8_pmu_driver = { 
	.driver		= {

		.name	= ARMV8_PMU_PDEV_NAME,

		.of_match_table = armv8_pmu_of_device_ids,

		.suppress_bind_attrs = true,

	},

	.probe		= armv8_pmu_device_probe,

};

arch/mips/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -791,6 +791,7 @@ config SIBYTE_SWARM 
	select SYS_SUPPORTS_HIGHMEM

	select SYS_SUPPORTS_LITTLE_ENDIAN

	select ZONE_DMA32 if 64BIT

	select SWIOTLB if ARCH_DMA_ADDR_T_64BIT && PCI



config SIBYTE_LITTLESUR

	bool "Sibyte BCM91250C2-LittleSur"
@@ -813,6 +814,7 @@ config SIBYTE_SENTOSA 
	select SYS_HAS_CPU_SB1

	select SYS_SUPPORTS_BIG_ENDIAN

	select SYS_SUPPORTS_LITTLE_ENDIAN

	select SWIOTLB if ARCH_DMA_ADDR_T_64BIT && PCI



config SIBYTE_BIGSUR

	bool "Sibyte BCM91480B-BigSur"
@@ -826,6 +828,7 @@ config SIBYTE_BIGSUR 
	select SYS_SUPPORTS_HIGHMEM

	select SYS_SUPPORTS_LITTLE_ENDIAN

	select ZONE_DMA32 if 64BIT

	select SWIOTLB if ARCH_DMA_ADDR_T_64BIT && PCI



config SNI_RM

	bool "SNI RM200/300/400"

arch/mips/sibyte/common/Makefile

+1 −0
Original line number Diff line number Diff line 
obj-y := cfe.o

obj-$(CONFIG_SWIOTLB)			+= dma.o

obj-$(CONFIG_SIBYTE_BUS_WATCHER)	+= bus_watcher.o

obj-$(CONFIG_SIBYTE_CFE_CONSOLE)	+= cfe_console.o

obj-$(CONFIG_SIBYTE_TBPROF)		+= sb_tbprof.o