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

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

Merge 4.9.141 into android-4.9 



Changes in 4.9.141
	cifs: don't dereference smb_file_target before null check
	reiserfs: propagate errors from fill_with_dentries() properly
	hfs: prevent btree data loss on root split
	hfsplus: prevent btree data loss on root split
	um: Give start_idle_thread() a return code
	drm/edid: Add 6 bpc quirk for BOE panel.
	platform/x86: intel_telemetry: report debugfs failure
	clk: fixed-rate: fix of_node_get-put imbalance
	fs/exofs: fix potential memory leak in mount option parsing
	clk: samsung: exynos5420: Enable PERIS clocks for suspend
	platform/x86: acerhdf: Add BIOS entry for Gateway LT31 v1.3307
	arm64: percpu: Initialize ret in the default case
	s390/vdso: add missing FORCE to build targets
	netfilter: ipset: actually allow allowable CIDR 0 in hash:net,port,net
	s390/mm: Fix ERROR: "__node_distance" undefined!
	netfilter: ipset: Correct rcu_dereference() call in ip_set_put_comment()
	netfilter: xt_IDLETIMER: add sysfs filename checking routine
	s390/qeth: fix HiperSockets sniffer
	hwmon: (ibmpowernv) Remove bogus __init annotations
	clk: fixed-factor: fix of_node_get-put imbalance
	lib/raid6: Fix arm64 test build
	qed: Fix memory/entry leak in qed_init_sp_request()
	qed: Fix blocking/unlimited SPQ entries leak
	zram: close udev startup race condition as default groups
	SUNRPC: drop pointless static qualifier in xdr_get_next_encode_buffer()
	gfs2: Put bitmap buffers in put_super
	ACPI / watchdog: Prefer iTCO_wdt on Lenovo Z50-70
	ACPI / watchdog: Prefer iTCO_wdt always when WDAT table uses RTC SRAM
	btrfs: Enhance btrfs_trim_fs function to handle error better
	btrfs: Ensure btrfs_trim_fs can trim the whole filesystem
	btrfs: fix pinned underflow after transaction aborted
	Revert "media: videobuf2-core: don't call memop 'finish' when queueing"
	Revert "Bluetooth: h5: Fix missing dependency on BT_HCIUART_SERDEV"
	media: v4l: event: Add subscription to list before calling "add" operation
	uio: Fix an Oops on load
	usb: cdc-acm: add entry for Hiro (Conexant) modem
	USB: quirks: Add no-lpm quirk for Raydium touchscreens
	usb: quirks: Add delay-init quirk for Corsair K70 LUX RGB
	misc: atmel-ssc: Fix section annotation on atmel_ssc_get_driver_data
	USB: misc: appledisplay: add 20" Apple Cinema Display
	drivers/misc/sgi-gru: fix Spectre v1 vulnerability
	ACPI / platform: Add SMB0001 HID to forbidden_id_list
	new helper: uaccess_kernel()
	HID: uhid: forbid UHID_CREATE under KERNEL_DS or elevated privileges
	libceph: fall back to sendmsg for slab pages
	Linux 4.9.141

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

Makefile

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

PATCHLEVEL = 9

SUBLEVEL = 140

SUBLEVEL = 141

EXTRAVERSION =

NAME = Roaring Lionus

arch/arm64/include/asm/percpu.h

+3 −0
Original line number Diff line number Diff line
@@ -93,6 +93,7 @@ static inline unsigned long __percpu_##op(void *ptr, \ 
		: [val] "Ir" (val));					\

		break;							\

	default:							\

		ret = 0;						\

		BUILD_BUG();						\

	}								\

									\
@@ -122,6 +123,7 @@ static inline unsigned long __percpu_read(void *ptr, int size) 
		ret = ACCESS_ONCE(*(u64 *)ptr);

		break;

	default:

		ret = 0;

		BUILD_BUG();

	}
@@ -191,6 +193,7 @@ static inline unsigned long __percpu_xchg(void *ptr, unsigned long val, 
		: [val] "r" (val));

		break;

	default:

		ret = 0;

		BUILD_BUG();

	}

arch/s390/kernel/vdso32/Makefile

+3 −3
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ UBSAN_SANITIZE := n 
$(obj)/vdso32_wrapper.o : $(obj)/vdso32.so



# link rule for the .so file, .lds has to be first

$(obj)/vdso32.so.dbg: $(src)/vdso32.lds $(obj-vdso32)

$(obj)/vdso32.so.dbg: $(src)/vdso32.lds $(obj-vdso32) FORCE

	$(call if_changed,vdso32ld)



# strip rule for the .so file
@@ -41,12 +41,12 @@ $(obj)/%.so: $(obj)/%.so.dbg FORCE 
	$(call if_changed,objcopy)



# assembly rules for the .S files

$(obj-vdso32): %.o: %.S

$(obj-vdso32): %.o: %.S FORCE

	$(call if_changed_dep,vdso32as)



# actual build commands

quiet_cmd_vdso32ld = VDSO32L $@

      cmd_vdso32ld = $(CC) $(c_flags) -Wl,-T $^ -o $@

      cmd_vdso32ld = $(CC) $(c_flags) -Wl,-T $(filter %.lds %.o,$^) -o $@

quiet_cmd_vdso32as = VDSO32A $@

      cmd_vdso32as = $(CC) $(a_flags) -c -o $@ $<

arch/s390/kernel/vdso64/Makefile

+3 −3
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ UBSAN_SANITIZE := n 
$(obj)/vdso64_wrapper.o : $(obj)/vdso64.so



# link rule for the .so file, .lds has to be first

$(obj)/vdso64.so.dbg: $(src)/vdso64.lds $(obj-vdso64)

$(obj)/vdso64.so.dbg: $(src)/vdso64.lds $(obj-vdso64) FORCE

	$(call if_changed,vdso64ld)



# strip rule for the .so file
@@ -41,12 +41,12 @@ $(obj)/%.so: $(obj)/%.so.dbg FORCE 
	$(call if_changed,objcopy)



# assembly rules for the .S files

$(obj-vdso64): %.o: %.S

$(obj-vdso64): %.o: %.S FORCE

	$(call if_changed_dep,vdso64as)



# actual build commands

quiet_cmd_vdso64ld = VDSO64L $@

      cmd_vdso64ld = $(CC) $(c_flags) -Wl,-T $^ -o $@

      cmd_vdso64ld = $(CC) $(c_flags) -Wl,-T $(filter %.lds %.o,$^) -o $@

quiet_cmd_vdso64as = VDSO64A $@

      cmd_vdso64as = $(CC) $(a_flags) -c -o $@ $<

arch/s390/numa/numa.c

+1 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ int __node_distance(int a, int b) 
{

	return mode->distance ? mode->distance(a, b) : 0;

}

EXPORT_SYMBOL(__node_distance);



int numa_debug_enabled;