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

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

Merge 4.14.5 into android-4.14



Changes in 4.14.5
	drm/fsl-dcu: avoid disabling pixel clock twice on suspend
	drm/fsl-dcu: enable IRQ before drm_atomic_helper_resume()
	drm/amdgpu: Use unsigned ring indices in amdgpu_queue_mgr_map
	s390/runtime instrumentation: simplify task exit handling
	usbip: fix usbip attach to find a port that matches the requested speed
	usbip: Fix USB device hang due to wrong enabling of scatter-gather
	uas: Always apply US_FL_NO_ATA_1X quirk to Seagate devices
	usb: quirks: Add no-lpm quirk for KY-688 USB 3.1 Type-C Hub
	serial: 8250_pci: Add Amazon PCI serial device ID
	ANDROID: binder: fix transaction leak.
	USB: serial: option: add Quectel BG96 id
	USB: serial: usb_debug: add new USB device id
	serial: 8250_early: Only set divisor if valid clk & baud
	MIPS: Add custom serial.h with BASE_BAUD override for generic kernel
	ima: fix hash algorithm initialization
	s390: vfio-ccw: Do not attempt to free no-op, test and tic cda.
	PM / Domains: Fix genpd to deal with drivers returning 1 from ->prepare()
	s390/pci: do not require AIS facility
	selftests/x86/ldt_get: Add a few additional tests for limits
	selftests/x86/ldt_gdt: Robustify against set_thread_area() and LAR oddities
	staging: greybus: loopback: Fix iteration count on async path
	m68k: fix ColdFire node shift size calculation
	serial: 8250_fintek: Fix rs485 disablement on invalid ioctl()
	staging: rtl8822be: fix wrong dma unmap len
	staging: rtl8188eu: avoid a null dereference on pmlmepriv
	spi: sh-msiof: Fix DMA transfer size check
	spi: spi-axi: fix potential use-after-free after deregistration
	mmc: tmio: check mmc_regulator_get_supply return value
	mmc: sdhci-msm: fix issue with power irq
	hwmon: (pmbus/core) Prevent unintentional setting of page to 0xFF
	perf/core: Fix __perf_read_group_add() locking
	usb: phy: tahvo: fix error handling in tahvo_usb_probe()
	PCI: dra7xx: Create functional dependency between PCIe and PHY
	x86/intel_rdt: Initialize bitmask of shareable resource if CDP enabled
	x86/intel_rdt: Fix potential deadlock during resctrl mount
	serial: 8250: Preserve DLD[7:4] for PORT_XR17V35X
	kprobes: Use synchronize_rcu_tasks() for optprobe with CONFIG_PREEMPT=y
	x86/entry: Use SYSCALL_DEFINE() macros for sys_modify_ldt()
	clocksource/drivers/arm_arch_timer: Validate CNTFRQ after enabling frame
	dt-bindings: timer: renesas, cmt: Fix SoC-specific compatible values
	EDAC, sb_edac: Fix missing break in switch
	usb: mtu3: fix error return code in ssusb_gadget_init()
	staging: fsl-dpaa2/eth: Account for Rx FD buffers on error path
	staging: rtl8822be: Keep array subscript no lower than zero
	ARM: cpuidle: Correct driver unregistration if init fails
	usb: xhci: Return error when host is dead in xhci_disable_slot()
	sysrq : fix Show Regs call trace on ARM
	serial: sh-sci: suppress warning for ports without dma channels
	usbip: tools: Install all headers needed for libusbip development
	serial: imx: Update cached mctrl value when changing RTS
	staging: fsl-mc/dpio: Fix incorrect comparison
	perf test attr: Fix ignored test case result
	perf test attr: Fix python error on empty result
	kprobes/x86: Disable preemption in ftrace-based jprobes
	locking/refcounts, x86/asm: Use unique .text section for refcount exceptions
	s390/ptrace: fix guarded storage regset handling
	tools include: Do not use poison with C++
	perf tools: Fix leaking rec_argv in error cases
	mm, x86/mm: Fix performance regression in get_user_pages_fast()
	iio: adc: ti-ads1015: add 10% to conversion wait time
	iio: multiplexer: add NULL check on devm_kzalloc() and devm_kmemdup() return values
	locking/refcounts, x86/asm: Enable CONFIG_ARCH_HAS_REFCOUNT
	powerpc/jprobes: Disable preemption when triggered through ftrace
	powerpc/kprobes: Disable preemption before invoking probe handler for optprobes
	dma-buf/sw_sync: force signal all unsignaled fences on dying timeline
	staging: ccree: fix leak of import() after init()
	usb: hub: Cycle HUB power when initialization fails
	USB: ulpi: fix bus-node lookup
	xhci: Don't show incorrect WARN message about events for empty rings
	usb: xhci: fix panic in xhci_free_virt_devices_depth_first
	USB: core: Add type-specific length check of BOS descriptors
	USB: usbfs: Filter flags passed in from user space
	usb: host: fix incorrect updating of offset
	locking/refcounts: Do not force refcount_t usage as GPL-only export
	Linux 4.14.5

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents c5c36272 64138f0a
Loading
Loading
Loading
Loading
+12 −12
Original line number Diff line number Diff line
@@ -20,16 +20,16 @@ Required Properties:
		(CMT1 on sh73a0 and r8a7740)
		This is a fallback for the above renesas,cmt-48-* entries.

    - "renesas,cmt0-r8a73a4" for the 32-bit CMT0 device included in r8a73a4.
    - "renesas,cmt1-r8a73a4" for the 48-bit CMT1 device included in r8a73a4.
    - "renesas,cmt0-r8a7790" for the 32-bit CMT0 device included in r8a7790.
    - "renesas,cmt1-r8a7790" for the 48-bit CMT1 device included in r8a7790.
    - "renesas,cmt0-r8a7791" for the 32-bit CMT0 device included in r8a7791.
    - "renesas,cmt1-r8a7791" for the 48-bit CMT1 device included in r8a7791.
    - "renesas,cmt0-r8a7793" for the 32-bit CMT0 device included in r8a7793.
    - "renesas,cmt1-r8a7793" for the 48-bit CMT1 device included in r8a7793.
    - "renesas,cmt0-r8a7794" for the 32-bit CMT0 device included in r8a7794.
    - "renesas,cmt1-r8a7794" for the 48-bit CMT1 device included in r8a7794.
    - "renesas,r8a73a4-cmt0" for the 32-bit CMT0 device included in r8a73a4.
    - "renesas,r8a73a4-cmt1" for the 48-bit CMT1 device included in r8a73a4.
    - "renesas,r8a7790-cmt0" for the 32-bit CMT0 device included in r8a7790.
    - "renesas,r8a7790-cmt1" for the 48-bit CMT1 device included in r8a7790.
    - "renesas,r8a7791-cmt0" for the 32-bit CMT0 device included in r8a7791.
    - "renesas,r8a7791-cmt1" for the 48-bit CMT1 device included in r8a7791.
    - "renesas,r8a7793-cmt0" for the 32-bit CMT0 device included in r8a7793.
    - "renesas,r8a7793-cmt1" for the 48-bit CMT1 device included in r8a7793.
    - "renesas,r8a7794-cmt0" for the 32-bit CMT0 device included in r8a7794.
    - "renesas,r8a7794-cmt1" for the 48-bit CMT1 device included in r8a7794.

    - "renesas,rcar-gen2-cmt0" for 32-bit CMT0 devices included in R-Car Gen2.
    - "renesas,rcar-gen2-cmt1" for 48-bit CMT1 devices included in R-Car Gen2.
@@ -46,7 +46,7 @@ Required Properties:
Example: R8A7790 (R-Car H2) CMT0 and CMT1 nodes

	cmt0: timer@ffca0000 {
		compatible = "renesas,cmt0-r8a7790", "renesas,rcar-gen2-cmt0";
		compatible = "renesas,r8a7790-cmt0", "renesas,rcar-gen2-cmt0";
		reg = <0 0xffca0000 0 0x1004>;
		interrupts = <0 142 IRQ_TYPE_LEVEL_HIGH>,
			     <0 142 IRQ_TYPE_LEVEL_HIGH>;
@@ -55,7 +55,7 @@ Example: R8A7790 (R-Car H2) CMT0 and CMT1 nodes
	};

	cmt1: timer@e6130000 {
		compatible = "renesas,cmt1-r8a7790", "renesas,rcar-gen2-cmt1";
		compatible = "renesas,r8a7790-cmt1", "renesas,rcar-gen2-cmt1";
		reg = <0 0xe6130000 0 0x1004>;
		interrupts = <0 120 IRQ_TYPE_LEVEL_HIGH>,
			     <0 121 IRQ_TYPE_LEVEL_HIGH>,
+1 −1
Original line number Diff line number Diff line
# SPDX-License-Identifier: GPL-2.0
VERSION = 4
PATCHLEVEL = 14
SUBLEVEL = 4
SUBLEVEL = 5
EXTRAVERSION =
NAME = Petit Gorille

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ config STATIC_KEYS_SELFTEST
config OPTPROBES
	def_bool y
	depends on KPROBES && HAVE_OPTPROBES
	depends on !PREEMPT
	select TASKS_RCU if PREEMPT

config KPROBES_ON_FTRACE
	def_bool y
+1 −1
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ void __init cf_bootmem_alloc(void)
	max_pfn = max_low_pfn = PFN_DOWN(_ramend);
	high_memory = (void *)_ramend;

	m68k_virt_to_node_shift = fls(_ramend - _rambase - 1) - 6;
	m68k_virt_to_node_shift = fls(_ramend - 1) - 6;
	module_fixup(NULL, __start_fixup, __stop_fixup);

	/* setup bootmem data */
+0 −1
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ generic-y += qrwlock.h
generic-y += qspinlock.h
generic-y += sections.h
generic-y += segment.h
generic-y += serial.h
generic-y += trace_clock.h
generic-y += unaligned.h
generic-y += user.h
Loading