Merge 4.9.60 into android-4.9

Changes in 4.9.60
	workqueue: replace pool->manager_arb mutex with a flag
	ALSA: hda/realtek - Add support for ALC236/ALC3204
	ALSA: hda - fix headset mic problem for Dell machines with alc236
	ceph: unlock dangling spinlock in try_flush_caps()
	usb: xhci: Handle error condition in xhci_stop_device()
	KVM: PPC: Fix oops when checking KVM_CAP_PPC_HTM
	spi: uapi: spidev: add missing ioctl header
	spi: bcm-qspi: Fix use after free in bcm_qspi_probe() in error path
	fuse: fix READDIRPLUS skipping an entry
	xen/gntdev: avoid out of bounds access in case of partial gntdev_mmap()
	Input: elan_i2c - add ELAN0611 to the ACPI table
	Input: gtco - fix potential out-of-bound access
	assoc_array: Fix a buggy node-splitting case
	scsi: zfcp: fix erp_action use-before-initialize in REC action trace
	scsi: sg: Re-fix off by one in sg_fill_request_table()
	drm/amd/powerplay: fix uninitialized variable
	can: sun4i: fix loopback mode
	can: kvaser_usb: Correct return value in printout
	can: kvaser_usb: Ignore CMD_FLUSH_QUEUE_REPLY messages
	cfg80211: fix connect/disconnect edge cases
	ipsec: Fix aborted xfrm policy dump crash
	regulator: fan53555: fix I2C device ids
	ecryptfs: fix dereference of NULL user_key_payload
	Linux 4.9.60

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

diff --cc Makefile
Simple merge

diff --cc fs/ecryptfs/ecryptfs_kernel.h
index 95c1c8d,a896e46..d4d8ad1
--- 1/fs/ecryptfs/ecryptfs_kernel.h
--- 2/fs/ecryptfs/ecryptfs_kernel.h
+++ b/fs/ecryptfs/ecryptfs_kernel.h
@@@ -114,12 -119,17 +119,17 @@@ static inline struct ecryptfs_auth_tok 
  ecryptfs_get_key_payload_data(struct key *key)
  {
        struct ecryptfs_auth_tok *auth_tok;
+       const struct user_key_payload *ukp;
  
        auth_tok = ecryptfs_get_encrypted_key_payload_data(key);
-       if (!auth_tok)
-               return (struct ecryptfs_auth_tok *)user_key_payload_locked(key)->data;
-       else
+       if (auth_tok)
                return auth_tok;
 -      ukp = user_key_payload(key);
+ 
++      ukp = user_key_payload_locked(key);
+       if (!ukp)
+               return ERR_PTR(-EKEYREVOKED);
+ 
+       return (struct ecryptfs_auth_tok *)ukp->data;
  }
  
  #define ECRYPTFS_MAX_KEYSET_SIZE 1024

diff --cc fs/fuse/dir.c
Simple merge

diff --cc net/xfrm/xfrm_user.c
Simple merge