Merge 4.14.224 into android-4.14-q

Changes in 4.14.224
	net: usb: qmi_wwan: support ZTE P685M modem
	scripts: use pkg-config to locate libcrypto
	scripts: set proper OpenSSL include dir also for sign-file
	hugetlb: fix update_and_free_page contig page struct assumption
	drm/virtio: use kvmalloc for large allocations
	virtio/s390: implement virtio-ccw revision 2 correctly
	arm64 module: set plt* section addresses to 0x0
	arm64: Avoid redundant type conversions in xchg() and cmpxchg()
	arm64: cmpxchg: Use "K" instead of "L" for ll/sc immediate constraint
	arm64: Use correct ll/sc atomic constraints
	JFS: more checks for invalid superblock
	media: mceusb: sanity check for prescaler value
	xfs: Fix assert failure in xfs_setattr_size()
	smackfs: restrict bytes count in smackfs write functions
	net: fix up truesize of cloned skb in skb_prepare_for_shift()
	mm/hugetlb.c: fix unnecessary address expansion of pmd sharing
	net: bridge: use switchdev for port flags set through sysfs too
	dt-bindings: net: btusb: DT fix s/interrupt-name/interrupt-names/
	staging: fwserial: Fix error handling in fwserial_create
	x86/reboot: Add Zotac ZBOX CI327 nano PCI reboot quirk
	vt/consolemap: do font sum unsigned
	wlcore: Fix command execute failure 19 for wl12xx
	pktgen: fix misuse of BUG_ON() in pktgen_thread_worker()
	ath10k: fix wmi mgmt tx queue full due to race condition
	x86/build: Treat R_386_PLT32 relocation as R_386_PC32
	Bluetooth: Fix null pointer dereference in amp_read_loc_assoc_final_data
	staging: most: sound: add sanity check for function argument
	media: uvcvideo: Allow entities with no pads
	f2fs: handle unallocated section and zone on pinned/atgc
	parisc: Bump 64-bit IRQ stack size to 64 KB
	scsi: iscsi: Restrict sessions and handles to admin capabilities
	sysfs: Add sysfs_emit and sysfs_emit_at to format sysfs output
	scsi: iscsi: Ensure sysfs attributes are limited to PAGE_SIZE
	scsi: iscsi: Verify lengths on passthrough PDUs
	Xen/gnttab: handle p2m update errors on a per-slot basis
	xen-netback: respect gnttab_map_refs()'s return value
	zsmalloc: account the number of compacted pages correctly
	swap: fix swapfile read/write offset
	media: v4l: ioctl: Fix memory leak in video_usercopy
	Linux 4.14.224

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I714d4e847d7f3c48dd0bb9671050307131c5372a

diff --cc Makefile
Simple merge

diff --cc arch/arm64/kernel/module.lds
index 99eb7c292494191b41a3d7dfa739b502eb64e80a,09a0eef71d12bd00fd14829861d70cb7c70b6549..9371abe2f4c2d3f9ef251d064dc73c14c89f4e8f
--- 1/arch/arm64/kernel/module.lds
--- 2/arch/arm64/kernel/module.lds
+++ b/arch/arm64/kernel/module.lds
@@@ -1,5 -1,5 +1,5 @@@
  SECTIONS {
-       .plt : { BYTE(0) }
-       .init.plt : { BYTE(0) }
-       .text.ftrace_trampoline : { BYTE(0) }
 -      .plt 0 (NOLOAD) : { BYTE(0) }
 -      .init.plt 0 (NOLOAD) : { BYTE(0) }
 -      .text.ftrace_trampoline 0 (NOLOAD) : { BYTE(0) }
++      .plt 0 : { BYTE(0) }
++      .init.plt 0 : { BYTE(0) }
++      .text.ftrace_trampoline 0 : { BYTE(0) }
  }

diff --cc drivers/block/zram/zram_drv.c
index 07d69851c3f47a98cb9249285e329712eb75405a,0798d6aacedd3fa5512d016f07c7448954a88b20..4b5e01c1fb4f72236d5434f95916d71904d52fe5
--- 1/drivers/block/zram/zram_drv.c
--- 2/drivers/block/zram/zram_drv.c
+++ b/drivers/block/zram/zram_drv.c
@@@ -1080,8 -738,7 +1080,8 @@@ static ssize_t mm_stat_show(struct devi
                        zram->limit_pages << PAGE_SHIFT,
                        max_used << PAGE_SHIFT,
                        (u64)atomic64_read(&zram->stats.same_pages),
-                       pool_stats.pages_compacted,
 -                      atomic_long_read(&pool_stats.pages_compacted));
++                      atomic_long_read(&pool_stats.pages_compacted),
 +                      (u64)atomic64_read(&zram->stats.huge_pages));
        up_read(&zram->init_lock);
  
        return ret;

diff --cc drivers/media/usb/uvc/uvc_driver.c
Simple merge

diff --cc drivers/media/v4l2-core/v4l2-ioctl.c
Simple merge

diff --cc fs/f2fs/segment.h
Simple merge

diff --cc include/linux/zsmalloc.h
Simple merge

diff --cc mm/page_io.c
index 9f8fd8f42b0d37d1a71c902f96a0b5f7115202f0,253623dbbb64495e66599a710ea71f8d67fd1893..f5eb086eca0c182570a58162b7b8c3745a68ae88
--- 1/mm/page_io.c
--- 2/mm/page_io.c
+++ b/mm/page_io.c
@@@ -381,10 -366,10 +376,10 @@@ int swap_readpage(struct page *page, bo
                ret = mapping->a_ops->readpage(swap_file, page);
                if (!ret)
                        count_vm_event(PSWPIN);
 -              return ret;
 +              goto out;
        }
  
-       ret = bdev_read_page(sis->bdev, swap_page_sector(page), page);
+       ret = bdev_read_page(sis->bdev, map_swap_page(page, &sis->bdev), page);
        if (!ret) {
                if (trylock_page(page)) {
                        swap_slot_free_notify(page);

diff --cc mm/zsmalloc.c
Simple merge

diff --cc net/core/pktgen.c
Simple merge

diff --cc net/core/skbuff.c
Simple merge