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

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

Merge 4.14.96 into android-4.14-p 



Changes in 4.14.96
	ipv6: Consider sk_bound_dev_if when binding a socket to a v4 mapped address
	mlxsw: spectrum: Disable lag port TX before removing it
	mlxsw: spectrum_switchdev: Set PVID correctly during VLAN deletion
	net, skbuff: do not prefer skb allocation fails early
	qmi_wwan: add MTU default to qmap network interface
	r8169: Add support for new Realtek Ethernet
	ipv6: Take rcu_read_lock in __inet6_bind for mapped addresses
	net: dsa: mv88x6xxx: mv88e6390 errata
	gpio: pl061: Move irq_chip definition inside struct pl061
	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
	x86/mce: Fix -Wmissing-prototypes warnings
	MIPS: SiByte: Enable swiotlb for SWARM, LittleSur and BigSur
	arm64: perf: set suppress_bind_attrs flag to true
	usb: gadget: udc: renesas_usb3: add a safety connection way for forced_b_device
	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
	clk: imx: make mux parent strings const
	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
	media: venus: core: Set dma maximum segment size
	net: call sk_dst_reset when set SO_DONTROUTE
	scsi: target: use consistent left-aligned ASCII INQUIRY data
	selftests: do not macro-expand failed assertion expressions
	clk: imx6q: reset exclusive gates on init
	arm64: Fix minor issues with the dcache_by_line_op macro
	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
	btrfs: improve error handling of btrfs_add_link
	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()
	netfilter: ipt_CLUSTERIP: check MAC address when duplicate config is set
	dm crypt: use u64 instead of sector_t to store iv_offset
	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
	quota: Lock s_umount in exclusive mode for Q_XQUOTA{ON,OFF} quotactls.
	clocksource/drivers/integrator-ap: Add missing of_node_put()
	ALSA: bebob: fix model-id of unit for Apogee Ensemble
	sysfs: Disable lockdep for driver bind/unbind files
	IB/usnic: Fix potential deadlock
	scsi: smartpqi: correct lun reset issues
	scsi: smartpqi: call pqi_free_interrupts() in pqi_shutdown()
	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/swap: use nr_node_ids for avail_lists in swap_info_struct
	mm, proc: be more verbose about unstable VMA flags in /proc/<pid>/smaps
	nfs: fix a deadlock in nfs client initialization
	ipmi:pci: Blacklist a Realtek "IPMI" device
	cifs: allow disabling insecure dialects in the config
	drm/i915/gvt: Fix mmap range check
	PCI: dwc: Move interrupt acking into the proper callback
	ipmi:ssif: Fix handling of multi-part return messages
	Linux 4.14.96

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents ce2fcb98 e6608e1f

Documentation/filesystems/proc.txt

+3 −1
Original line number Diff line number Diff line
@@ -497,7 +497,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 
# SPDX-License-Identifier: GPL-2.0

VERSION = 4

PATCHLEVEL = 14

SUBLEVEL = 95

SUBLEVEL = 96

EXTRAVERSION =

NAME = Petit Gorille

arch/arm64/include/asm/assembler.h

+18 −12
Original line number Diff line number Diff line
@@ -373,27 +373,33 @@ alternative_endif 
 * 	size:		size of the region

 * 	Corrupts:	kaddr, size, tmp1, tmp2

 */

	.macro __dcache_op_workaround_clean_cache, op, kaddr

alternative_if_not ARM64_WORKAROUND_CLEAN_CACHE

	dc	\op, \kaddr

alternative_else

	dc	civac, \kaddr

alternative_endif

	.endm



	.macro dcache_by_line_op op, domain, kaddr, size, tmp1, tmp2

	dcache_line_size \tmp1, \tmp2

	add	\size, \kaddr, \size

	sub	\tmp2, \tmp1, #1

	bic	\kaddr, \kaddr, \tmp2

9998:

	.if	(\op == cvau || \op == cvac)

alternative_if_not ARM64_WORKAROUND_CLEAN_CACHE

	dc	\op, \kaddr

alternative_else

	dc	civac, \kaddr

alternative_endif

	.elseif	(\op == cvap)

alternative_if ARM64_HAS_DCPOP

	.ifc	\op, cvau

	__dcache_op_workaround_clean_cache \op, \kaddr

	.else

	.ifc	\op, cvac

	__dcache_op_workaround_clean_cache \op, \kaddr

	.else

	.ifc	\op, cvap

	sys	3, c7, c12, 1, \kaddr	// dc cvap

alternative_else

	dc	cvac, \kaddr

alternative_endif

	.else

	dc	\op, \kaddr

	.endif

	.endif

	.endif

	add	\kaddr, \kaddr, \tmp1

	cmp	\kaddr, \size

	b.lo	9998b

arch/arm64/kernel/perf_event.c

+1 −0
Original line number Diff line number Diff line
@@ -1130,6 +1130,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/arm64/mm/cache.S

+3 −0
Original line number Diff line number Diff line
@@ -181,6 +181,9 @@ ENDPROC(__dma_clean_area) 
 *	- size    - size in question

 */

ENTRY(__clean_dcache_area_pop)

	alternative_if_not ARM64_HAS_DCPOP

	b	__clean_dcache_area_poc

	alternative_else_nop_endif

	dcache_by_line_op cvap, sy, x0, x1, x2, x3

	ret

ENDPIPROC(__clean_dcache_area_pop)