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

Commit 2c71b7cb authored by Dmitry Shmidt's avatar Dmitry Shmidt
Browse files

Merge 4.14.23 into android-4.14 



Changes in 4.14.23
	netfilter: drop outermost socket lock in getsockopt()
	arm64: mm: don't write garbage into TTBR1_EL1 register
	kconfig.h: Include compiler types to avoid missed struct attributes
	MIPS: boot: Define __ASSEMBLY__ for its.S build
	xtensa: fix high memory/reserved memory collision
	scsi: ibmvfc: fix misdefined reserved field in ibmvfc_fcp_rsp_info
	MIPS: Drop spurious __unused in struct compat_flock
	cfg80211: fix cfg80211_beacon_dup
	i2c: designware: must wait for enable
	i2c: bcm2835: Set up the rising/falling edge delays
	X.509: fix BUG_ON() when hash algorithm is unsupported
	X.509: fix NULL dereference when restricting key with unsupported_sig
	PKCS#7: fix certificate chain verification
	PKCS#7: fix certificate blacklisting
	extcon: int3496: process id-pin first so that we start with the right status
	RDMA/uverbs: Protect from races between lookup and destroy of uobjects
	RDMA/uverbs: Protect from command mask overflow
	RDMA/uverbs: Fix bad unlock balance in ib_uverbs_close_xrcd
	RDMA/uverbs: Fix circular locking dependency
	RDMA/uverbs: Sanitize user entered port numbers prior to access it
	iio: adc: stm32: fix stm32h7_adc_enable error handling
	iio: srf08: fix link error "devm_iio_triggered_buffer_setup" undefined
	iio: buffer: check if a buffer has been set up when poll is called
	iio: adis_lib: Initialize trigger before requesting interrupt
	Kbuild: always define endianess in kconfig.h
	x86/oprofile: Fix bogus GCC-8 warning in nmi_setup()
	mm, swap, frontswap: fix THP swap if frontswap enabled
	irqchip/gic-v3: Use wmb() instead of smb_wmb() in gic_raise_softirq()
	irqchip/mips-gic: Avoid spuriously handling masked interrupts
	PCI/cxgb4: Extend T3 PCI quirk to T4+ devices
	ohci-hcd: Fix race condition caused by ohci_urb_enqueue() and io_watchdog_func()
	usb: ohci: Proper handling of ed_rm_list to handle race condition between usb_kill_urb() and finish_unlinks()
	arm64: Remove unimplemented syscall log message
	arm64: Disable unhandled signal log messages by default
	arm64: cpufeature: Fix CTR_EL0 field definitions
	Add delay-init quirk for Corsair K70 RGB keyboards
	drm/edid: Add 6 bpc quirk for CPT panel in Asus UX303LA
	usb: host: ehci: use correct device pointer for dma ops
	usb: dwc3: gadget: Set maxpacket size for ep0 IN
	usb: dwc3: ep0: Reset TRB counter for ep0 IN
	usb: ldusb: add PIDs for new CASSY devices supported by this driver
	Revert "usb: musb: host: don't start next rx urb if current one failed"
	usb: gadget: f_fs: Process all descriptors during bind
	usb: gadget: f_fs: Use config_ep_by_speed()
	usb: renesas_usbhs: missed the "running" flag in usb_dmac with rx path
	drm/cirrus: Load lut in crtc_commit
	drm: Handle unexpected holes in color-eviction
	drm/amdgpu: disable MMHUB power gating on raven
	drm/amdgpu: Add dpm quirk for Jet PRO (v2)
	drm/amdgpu: only check mmBIF_IOV_FUNC_IDENTIFIER on tonga/fiji
	drm/amdgpu: add atpx quirk handling (v2)
	drm/amdgpu: Avoid leaking PM domain on driver unbind (v2)
	drm/amdgpu: add new device to use atpx quirk
	drm/i915/breadcrumbs: Ignore unsubmitted signalers
	m32r: fix endianness constraints
	microblaze: fix endian handling
	Linux 4.14.23

Change-Id: I065d928eedf89f981316268f19362d9f8c418431
Signed-off-by: default avatarDmitry Shmidt <dimitrysh@google.com>
parents 5eb2fa0b 267ef1d3

Makefile

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

VERSION = 4

PATCHLEVEL = 14

SUBLEVEL = 22

SUBLEVEL = 23

EXTRAVERSION =

NAME = Petit Gorille

arch/arm64/kernel/cpufeature.c

+4 −2
Original line number Diff line number Diff line
@@ -175,9 +175,11 @@ static const struct arm64_ftr_bits ftr_id_aa64mmfr2[] = { 
};



static const struct arm64_ftr_bits ftr_ctr[] = {

	ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_EXACT, 31, 1, 1),	/* RAO */

	ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_EXACT, 31, 1, 1),		/* RES1 */

	ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_LOWER_SAFE, 29, 1, 1),	/* DIC */

	ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_LOWER_SAFE, 28, 1, 1),	/* IDC */

	ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_HIGHER_SAFE, 24, 4, 0),	/* CWG */

	ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_LOWER_SAFE, 20, 4, 0),	/* ERG */

	ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_HIGHER_SAFE, 20, 4, 0),	/* ERG */

	ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_LOWER_SAFE, 16, 4, 1),	/* DminLine */

	/*

	 * Linux can handle differing I-cache policies. Userspace JITs will

arch/arm64/kernel/traps.c

+1 −9
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ static const char *handler[]= { 
	"Error"

};



int show_unhandled_signals = 1;

int show_unhandled_signals = 0;



/*

 * Dump out the contents of some kernel memory nicely...
@@ -573,14 +573,6 @@ asmlinkage long do_ni_syscall(struct pt_regs *regs) 
	}

#endif



	if (show_unhandled_signals_ratelimited()) {

		pr_info("%s[%d]: syscall %d\n", current->comm,

			task_pid_nr(current), regs->syscallno);

		dump_instr("", regs);

		if (user_mode(regs))

			__show_regs(regs);

	}



	return sys_ni_syscall();

}

arch/arm64/mm/proc.S

+1 −1
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ ENDPROC(cpu_do_switch_mm) 


.macro	__idmap_cpu_set_reserved_ttbr1, tmp1, tmp2

	adrp	\tmp1, empty_zero_page

	msr	ttbr1_el1, \tmp2

	msr	ttbr1_el1, \tmp1

	isb

	tlbi	vmalle1

	dsb	nsh

arch/m32r/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -196,8 +196,8 @@ config TIMER_DIVIDE 
	default "128"



config CPU_BIG_ENDIAN

        bool "Generate big endian code"

	default n

	bool

	default !CPU_LITTLE_ENDIAN



config CPU_LITTLE_ENDIAN

        bool "Generate little endian code"