Merge tag 'v4.4.199' of https://shanghai.source.codeaurora.org/quic/la/kernel/msm...

This is the 4.4.199 stable release

diff --cc Makefile
Simple merge

diff --cc drivers/base/core.c
Simple merge

diff --cc drivers/block/loop.c
index 1a1b094,8aadd4d..aa7895f
--- 1/drivers/block/loop.c
--- 2/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@@ -1613,7 -1557,7 +1613,8 @@@ static int lo_compat_ioctl(struct block
                arg = (unsigned long) compat_ptr(arg);
        case LOOP_SET_FD:
        case LOOP_CHANGE_FD:
 +      case LOOP_SET_BLOCK_SIZE:
+       case LOOP_SET_DIRECT_IO:
                err = lo_ioctl(bdev, mode, cmd, arg);
                break;
        default:

diff --cc drivers/cpufreq/cpufreq.c
Simple merge

diff --cc drivers/gpu/drm/drm_edid.c
Simple merge

diff --cc drivers/hid/hid-core.c
Simple merge

diff --cc drivers/md/dm-snap.c
index 2a855e5,510b0cf..55e1585
--- 1/drivers/md/dm-snap.c
--- 2/drivers/md/dm-snap.c
+++ b/drivers/md/dm-snap.c
@@@ -1513,11 -1562,13 +1561,11 @@@ out
        snapshot_bios = bio_list_get(&pe->snapshot_bios);
        origin_bios = bio_list_get(&pe->origin_bios);
        full_bio = pe->full_bio;
 -      if (full_bio) {
 +      if (full_bio)
                full_bio->bi_end_io = pe->full_bio_end_io;
 -              full_bio->bi_private = pe->full_bio_private;
 -      }
        increment_pending_exceptions_done_count();
  
-       up_write(&s->lock);
+       mutex_unlock(&s->lock);
  
        /* Submit any pending write bios */
        if (error) {
@@@ -1622,8 -1673,9 +1670,8 @@@ static void start_full_bio(struct dm_sn
  
        pe->full_bio = bio;
        pe->full_bio_end_io = bio->bi_end_io;
 -      pe->full_bio_private = bio->bi_private;
  
-       down(&s->cow_count);
+       account_start_copy(s);
        callback_data = dm_kcopyd_prepare_callback(s->kcopyd_client,
                                                   copy_callback, pe);
  

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

diff --cc drivers/pci/pci.c
Simple merge

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

diff --cc drivers/scsi/ufs/ufshcd.c
Simple merge

diff --cc drivers/usb/core/hub.c
index a9f4d4f,11881c5..6f68e45
--- 1/drivers/usb/core/hub.c
--- 2/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@@ -109,12 -102,9 +109,14 @@@ EXPORT_SYMBOL_GPL(ehci_cf_port_reset_rw
  static void hub_release(struct kref *kref);
  static int usb_reset_and_verify_device(struct usb_device *udev);
  static int hub_port_disable(struct usb_hub *hub, int port1, int set_state);
+ static bool hub_port_warm_reset_required(struct usb_hub *hub, int port1,
+               u16 portstatus);
  
 +#define USB_VENDOR_XIAOMI             0x2717
 +#define USB_PRODUCT_XIAOMI_HEADSET    0x3801
 +
 +bool is_xiaomi_headset = false;
 +
  static inline char *portspeed(struct usb_hub *hub, int portstatus)
  {
        if (hub_is_superspeed(hub->hdev))

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

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

diff --cc include/linux/usb/gadget.h
Simple merge

diff --cc kernel/trace/trace.c
Simple merge

diff --cc mm/shmem.c
Simple merge

diff --cc mm/slub.c
Simple merge

diff --cc net/ipv4/route.c
Simple merge

diff --cc net/mac80211/mlme.c
Simple merge

diff --cc net/wireless/nl80211.c
Simple merge

diff --cc scripts/setlocalversion
Simple merge