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

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

Merge 4.14.58 into android-4.14 



Changes in 4.14.58
	scsi: sd_zbc: Fix variable type and bogus comment
	KVM/Eventfd: Avoid crash when assign and deassign specific eventfd in parallel.
	x86/apm: Don't access __preempt_count with zeroed fs
	x86/events/intel/ds: Fix bts_interrupt_threshold alignment
	x86/MCE: Remove min interval polling limitation
	fat: fix memory allocation failure handling of match_strdup()
	ALSA: rawmidi: Change resized buffers atomically
	ALSA: hda/realtek - Add Panasonic CF-SZ6 headset jack quirk
	ALSA: hda: add mute led support for HP ProBook 455 G5
	ARCv2: [plat-hsdk]: Save accl reg pair by default
	ARC: Fix CONFIG_SWAP
	ARC: configs: Remove CONFIG_INITRAMFS_SOURCE from defconfigs
	ARC: mm: allow mprotect to make stack mappings executable
	mm: memcg: fix use after free in mem_cgroup_iter()
	mm/huge_memory.c: fix data loss when splitting a file pmd
	cpufreq: intel_pstate: Register when ACPI PCCH is present
	vfio/pci: Fix potential Spectre v1
	vfio/spapr: Use IOMMU pageshift rather than pagesize
	stop_machine: Disable preemption when waking two stopper threads
	drm/i915: Fix hotplug irq ack on i965/g4x
	drm/nouveau: Use drm_connector_list_iter_* for iterating connectors
	drm/nouveau: Avoid looping through fake MST connectors
	gen_stats: Fix netlink stats dumping in the presence of padding
	ipv4: Return EINVAL when ping_group_range sysctl doesn't map to user ns
	ipv6: fix useless rol32 call on hash
	ipv6: ila: select CONFIG_DST_CACHE
	lib/rhashtable: consider param->min_size when setting initial table size
	net: diag: Don't double-free TCP_NEW_SYN_RECV sockets in tcp_abort
	net: Don't copy pfmemalloc flag in __copy_skb_header()
	skbuff: Unconditionally copy pfmemalloc in __skb_clone()
	net/ipv4: Set oif in fib_compute_spec_dst
	net: phy: fix flag masking in __set_phy_supported
	ptp: fix missing break in switch
	qmi_wwan: add support for Quectel EG91
	tg3: Add higher cpu clock for 5762.
	hv_netvsc: Fix napi reschedule while receive completion is busy
	net/mlx4_en: Don't reuse RX page when XDP is set
	net: systemport: Fix CRC forwarding check for SYSTEMPORT Lite
	ipv6: make DAD fail with enhanced DAD when nonce length differs
	net: usb: asix: replace mii_nway_restart in resume path
	alpha: fix osf_wait4() breakage
	cxl_getfile(): fix double-iput() on alloc_file() failures
	powerpc/powernv: Fix save/restore of SPRG3 on entry/exit from stop (idle)
	xhci: Fix perceived dead host due to runtime suspend race with event handler
	Linux 4.14.58

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 5aaaa537 f952480a

Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

VERSION = 4

PATCHLEVEL = 14

SUBLEVEL = 57

SUBLEVEL = 58

EXTRAVERSION =

NAME = Petit Gorille

arch/alpha/kernel/osf_sys.c

+1 −4
Original line number Diff line number Diff line
@@ -1183,13 +1183,10 @@ SYSCALL_DEFINE2(osf_getrusage, int, who, struct rusage32 __user *, ru) 
SYSCALL_DEFINE4(osf_wait4, pid_t, pid, int __user *, ustatus, int, options,

		struct rusage32 __user *, ur)

{

	unsigned int status = 0;

	struct rusage r;

	long err = kernel_wait4(pid, &status, options, &r);

	long err = kernel_wait4(pid, ustatus, options, &r);

	if (err <= 0)

		return err;

	if (put_user(status, ustatus))

		return -EFAULT;

	if (!ur)

		return err;

	if (put_tv32(&ur->ru_utime, &r.ru_utime))

arch/arc/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -408,7 +408,7 @@ config ARC_HAS_DIV_REM 


config ARC_HAS_ACCL_REGS

	bool "Reg Pair ACCL:ACCH (FPU and/or MPY > 6)"

	default n

	default y

	help

	  Depending on the configuration, CPU can contain accumulator reg-pair

	  (also referred to as r58:r59). These can also be used by gcc as GPR so

arch/arc/configs/axs101_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ CONFIG_NAMESPACES=y 
# CONFIG_UTS_NS is not set

# CONFIG_PID_NS is not set

CONFIG_BLK_DEV_INITRD=y

CONFIG_INITRAMFS_SOURCE="../arc_initramfs/"

CONFIG_EMBEDDED=y

CONFIG_PERF_EVENTS=y

# CONFIG_VM_EVENT_COUNTERS is not set

arch/arc/configs/axs103_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ CONFIG_NAMESPACES=y 
# CONFIG_UTS_NS is not set

# CONFIG_PID_NS is not set

CONFIG_BLK_DEV_INITRD=y

CONFIG_INITRAMFS_SOURCE="../../arc_initramfs_hs/"

CONFIG_EMBEDDED=y

CONFIG_PERF_EVENTS=y

# CONFIG_VM_EVENT_COUNTERS is not set