Merge 4.14.282 into android-4.14-q

Changes in 4.14.282
	x86/pci/xen: Disable PCI/MSI[-X] masking for XEN_HVM guests
	staging: rtl8723bs: prevent ->Ssid overflow in rtw_wx_set_scan()
	tcp: change source port randomizarion at connect() time
	secure_seq: use the 64 bits of the siphash for port offset calculation
	ACPI: sysfs: Make sparse happy about address space in use
	ACPI: sysfs: Fix BERT error region memory mapping
	net: af_key: check encryption module availability consistency
	net: ftgmac100: Disable hardware checksum on AST2600
	drivers: i2c: thunderx: Allow driver to work with ACPI defined TWSI controllers
	assoc_array: Fix BUG_ON during garbage collect
	drm/i915: Fix -Wstringop-overflow warning in call to intel_read_wm_latency()
	block-map: add __GFP_ZERO flag for alloc_page in function bio_copy_kern
	exec: Force single empty string when argv is empty
	netfilter: conntrack: re-fetch conntrack after insertion
	zsmalloc: fix races between asynchronous zspage free and page migration
	dm integrity: fix error code in dm_integrity_ctr()
	dm crypt: make printing of the key constant-time
	dm stats: add cond_resched when looping over entries
	dm verity: set DM_TARGET_IMMUTABLE feature flag
	tpm: ibmvtpm: Correct the return value in tpm_ibmvtpm_probe()
	docs: submitting-patches: Fix crossref to 'The canonical patch format'
	NFSD: Fix possible sleep during nfsd4_release_lockowner()
	bpf: Enlarge offset check value to INT_MAX in bpf_skb_{load,store}_bytes
	Linux 4.14.282

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

diff --cc Makefile
Simple merge

diff --cc drivers/acpi/sysfs.c
Simple merge

diff --cc drivers/md/dm-crypt.c
Simple merge

diff --cc drivers/md/dm-verity-target.c
index af4a6eec666f04db3c4245e795491e98df4fb99b,77fca0432d25e5bdc11a582198ef613bf0a29a0a..383249c1a5ed596bb2bd8cefe279abc7011ee4d6
--- 1/drivers/md/dm-verity-target.c
--- 2/drivers/md/dm-verity-target.c
+++ b/drivers/md/dm-verity-target.c
@@@ -1238,7 -1163,8 +1238,8 @@@ bad
  
  static struct target_type verity_target = {
        .name           = "verity",
 -      .version        = {1, 3, 0},
+       .features       = DM_TARGET_IMMUTABLE,
 +      .version        = {1, 4, 0},
        .module         = THIS_MODULE,
        .ctr            = verity_ctr,
        .dtr            = verity_dtr,

diff --cc fs/exec.c
Simple merge

diff --cc mm/zsmalloc.c
Simple merge

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

diff --cc net/key/af_key.c
Simple merge