Merge android-4.4@29d0b65 (v4.4.88) into msm-4.4

* refs/heads/tmp-29d0b65
  Linux 4.4.88
  xfs: XFS_IS_REALTIME_INODE() should be false if no rt device present
  NFS: Fix 2 use after free issues in the I/O code
  ARM: 8692/1: mm: abort uaccess retries upon fatal signal
  Bluetooth: Properly check L2CAP config option output buffer length
  ALSA: msnd: Optimize / harden DSP and MIDI loops
  locktorture: Fix potential memory leak with rw lock test
  btrfs: resume qgroup rescan on rw remount
  drm/bridge: adv7511: Re-write the i2c address before EDID probing
  drm/bridge: adv7511: Switch to using drm_kms_helper_hotplug_event()
  drm/bridge: adv7511: Use work_struct to defer hotplug handing to out of irq context
  drm/bridge: adv7511: Fix mutex deadlock when interrupts are disabled
  drm: adv7511: really enable interrupts for EDID detection
  scsi: sg: recheck MMAP_IO request length with lock held
  scsi: sg: protect against races between mmap() and SG_SET_RESERVED_SIZE
  cs5536: add support for IDE controller variant
  workqueue: Fix flag collision
  drm/nouveau/pci/msi: disable MSI on big-endian platforms by default
  mwifiex: correct channel stat buffer overflows
  dlm: avoid double-free on error path in dlm_device_{register,unregister}
  Bluetooth: Add support of 13d3:3494 RTL8723BE device
  rtlwifi: rtl_pci_probe: Fix fail path of _rtl_pci_find_adapter
  Input: trackpoint - assume 3 buttons when buttons detection fails
  ath10k: fix memory leak in rx ring buffer allocation
  intel_th: pci: Add Cannon Lake PCH-LP support
  intel_th: pci: Add Cannon Lake PCH-H support
  driver core: bus: Fix a potential double free
  staging/rts5208: fix incorrect shift to extract upper nybble
  USB: core: Avoid race of async_completed() w/ usbdev_release()
  usb:xhci:Fix regression when ATI chipsets detected
  usb: Add device quirk for Logitech HD Pro Webcam C920-C
  USB: serial: option: add support for D-Link DWM-157 C1
  usb: quirks: add delay init quirk for Corsair Strafe RGB keyboard
  ANDROID: sdcardfs: Add missing break
  ANDROID: Sdcardfs: Move gid derivation under flag
  ANDROID: mnt: Fix freeing of mount data
  drivers: cpufreq: checks to avoid kernel crash in cpufreq_interactive
  ANDROID: Use sk_uid to replace uid get from socket file
  ANDROID: nf: xt_qtaguid: fix handling for cases where tunnels are used.
  Revert "ANDROID: Use sk_uid to replace uid get from socket file"
  ANDROID: fiq_debugger: Fix minor bug in code

Conflicts:
	drivers/cpufreq/cpufreq_interactive.c
	drivers/net/wireless/ath/ath10k/core.c
	drivers/staging/android/fiq_debugger/fiq_debugger.c
	net/netfilter/xt_qtaguid.c

Change-Id: I49c67ff84d4bee0799691cc1ee0a023e2dd13e66
Signed-off-by: Blagovest Kolenichev <bkolenichev@codeaurora.org>

diff --cc Makefile
Simple merge

diff --cc drivers/scsi/sg.c
Simple merge

diff --cc drivers/staging/android/fiq_debugger/fiq_debugger.c
index 15ff4e1,ef9fa48..08113a3
--- 1/drivers/staging/android/fiq_debugger/fiq_debugger.c
--- 2/drivers/staging/android/fiq_debugger/fiq_debugger.c
+++ b/drivers/staging/android/fiq_debugger/fiq_debugger.c
@@@ -402,7 -401,7 +402,7 @@@ static void fiq_debugger_work(struct wo
                cmd += 6;
                while (*cmd == ' ')
                        cmd++;
-               if ((cmd != '\0') && sysrq_on())
 -              if (*cmd != '\0')
++              if ((*cmd != '\0') && sysrq_on())
                        kernel_restart(cmd);
                else
                        kernel_restart(NULL);

diff --cc fs/namespace.c
Simple merge

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

diff --cc net/bluetooth/l2cap_core.c
index bd5937d,357bcd3..f703d46
--- 1/net/bluetooth/l2cap_core.c
--- 2/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@@ -3175,9 -3178,10 +3178,10 @@@ static int l2cap_build_conf_req(struct 
        struct l2cap_conf_req *req = data;
        struct l2cap_conf_rfc rfc = { .mode = chan->mode };
        void *ptr = req->data;
+       void *endptr = data + data_size;
        u16 size;
  
 -      BT_DBG("chan %p", chan);
 +      BT_DBG("chan %pK", chan);
  
        if (chan->num_conf_req || chan->num_conf_rsp)
                goto done;

diff --cc net/netfilter/xt_qtaguid.c
index b0e0555,6f5cdc5..d44469c
--- 1/net/netfilter/xt_qtaguid.c
--- 2/net/netfilter/xt_qtaguid.c
+++ b/net/netfilter/xt_qtaguid.c
@@@ -1759,12 -1759,13 +1759,13 @@@ static bool qtaguid_mt(const struct sk_
                kgid_t gid_max = make_kgid(&init_user_ns, info->gid_max);
                set_sk_callback_lock = true;
                read_lock_bh(&sk->sk_callback_lock);
 -              MT_DEBUG("qtaguid[%d]: sk=%p->sk_socket=%p->file=%p\n",
 +              MT_DEBUG("qtaguid[%d]: sk=%pK->sk_socket=%pK->file=%pK\n",
-                       par->hooknum, sk, sk->sk_socket,
-                       sk->sk_socket ? sk->sk_socket->file : (void *)-1LL);
+                        par->hooknum, sk, sk->sk_socket,
+                        sk->sk_socket ? sk->sk_socket->file : (void *)-1LL);
                filp = sk->sk_socket ? sk->sk_socket->file : NULL;
                if (!filp) {
-                       res = ((info->match ^ info->invert) & XT_QTAGUID_GID) == 0;
+                       res = ((info->match ^ info->invert) &
+                              XT_QTAGUID_GID) == 0;
                        atomic64_inc(&qtu_events.match_no_sk_gid);
                        goto put_sock_ret_res;
                }