Merge branches 'for-4.4/upstream-fixes', 'for-4.5/async-suspend', 'for-4.5/container...

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/hid/hid-core.c
index ab3b86c327a359a453e6eec4ce1caa5c0a7dcc77,e9ef0dd4fd893d63e50df4b95edf9e8897b6fd39,e847fb7f5d5d6ecaab52e30f1ef84ba775a3f884,3c1cfc6d99641b0c91013070422775b59757a7c3,c6f7a694f67a189daaae4be80645fb8773bfd2d5,190260c52adc7f07a3307049add7aa9f68909eb5,c6f7a694f67a189daaae4be80645fb8773bfd2d5,c6f7a694f67a189daaae4be80645fb8773bfd2d5,c6f7a694f67a189daaae4be80645fb8773bfd2d5,c6f7a694f67a189daaae4be80645fb8773bfd2d5..7e89288b15375a2e8016ea6b31f5904e95c32719
--- 1/drivers/hid/hid-core.c
--- 2/drivers/hid/hid-core.c
--- 3/drivers/hid/hid-core.c
--- 4/drivers/hid/hid-core.c
--- 5/drivers/hid/hid-core.c
--- 6/drivers/hid/hid-core.c
--- 7/drivers/hid/hid-core.c
--- 8/drivers/hid/hid-core.c
--- 9/drivers/hid/hid-core.c
--- 10/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@@@@@@@@@@ -2223,12 -2223,12 -2223,12 -2217,9 -2223,12 -2224,12 -2223,12 -2223,12 -2223,12 -2223,12 +2217,9 @@@@@@@@@@@ static ssize_t modalias_show(struct dev
                                     char *buf)
          {
                struct hid_device *hdev = container_of(dev, struct hid_device, dev);
--- ------      int len;
--  ------
--  ------      len = snprintf(buf, PAGE_SIZE, "hid:b%04Xg%04Xv%08Xp%08X\n",
--  ------                     hdev->bus, hdev->group, hdev->vendor, hdev->product);
          
  -             len = snprintf(buf, PAGE_SIZE, "hid:b%04Xg%04Xv%08Xp%08X\n",
  -                            hdev->bus, hdev->group, hdev->vendor, hdev->product);
  -       
--- ------      return (len >= PAGE_SIZE) ? (PAGE_SIZE - 1) : len;
+++ ++++++      return scnprintf(buf, PAGE_SIZE, "hid:b%04Xg%04Xv%08Xp%08X\n",
+++ ++++++                       hdev->bus, hdev->group, hdev->vendor, hdev->product);
          }
          static DEVICE_ATTR_RO(modalias);
          

diff --cc drivers/hid/hid-ids.h
Simple merge

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

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

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

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

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

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