Merge branch 'dev/android-4.9.135-o' into rel-32-4.9

Minor Kernel upgrade from K4.9.129-o to K4.9.135-o

Bug 200462094

Resolved Conflicts:
	drivers/hid/hid-core.c
	drivers/hid/hid-sony.c

Change-Id: Ibd9cc4d062eee5df9944fc5fe30d4eb68d98031b
Signed-off-by: Ketan Patil <ketanp@nvidia.com>

diff --cc Makefile
index e1d88b4b4acfef41e28031517101c3458c563b3d,3678e4d19ebcd2302bcdce7fd467fab5cdedf5d0..713c2bf45f44d65815a5290e46a93e70eeff2b42
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -1,25 -1,6 +1,25 @@@
 +ifeq ($(KERNEL_OVERLAYS),)
 +KERNEL_OVERLAYS :=
 +KERNEL_OVERLAYS += $(CURDIR)/../nvidia
 +KERNEL_OVERLAYS += $(CURDIR)/../nvgpu
 +KERNEL_OVERLAYS += $(CURDIR)/../nvgpu-next
 +KERNEL_OVERLAYS += $(CURDIR)/../nvidia-t23x
 +else
 +override KERNEL_OVERLAYS := $(subst :, ,$(KERNEL_OVERLAYS))
 +endif
 +override KERNEL_OVERLAYS := $(abspath $(KERNEL_OVERLAYS))
 +export KERNEL_OVERLAYS
 +
 +define set_srctree_overlay
 +  overlay_name := $(lastword $(subst /, ,$(overlay)))
 +  srctree.$(overlay_name) := $(overlay)
 +  export srctree.$(overlay_name)
 +endef
 +$(foreach overlay,$(KERNEL_OVERLAYS),$(eval $(value set_srctree_overlay)))
 +
  VERSION = 4
  PATCHLEVEL = 9
- SUBLEVEL = 129
+ SUBLEVEL = 135
  EXTRAVERSION =
  NAME = Roaring Lionus
  

diff --cc crypto/ablkcipher.c
index 900acbe3d4d045eed29cc386ebe23dc817999668,3bc0e76eaaefe740154dab41d3f09ed75194ec9a..2d6ac3cfb950dc329369f6341e6bb7bcb31dc99f
--- 1/crypto/ablkcipher.c
--- 2/crypto/ablkcipher.c
+++ b/crypto/ablkcipher.c
@@@ -367,8 -365,9 +367,9 @@@ static int crypto_ablkcipher_report(str
        struct crypto_report_blkcipher rblkcipher;
  
        strncpy(rblkcipher.type, "ablkcipher", sizeof(rblkcipher.type));
 -      strncpy(rblkcipher.geniv, alg->cra_ablkcipher.geniv ?: "<default>",
 +      strlcpy(rblkcipher.geniv, alg->cra_ablkcipher.geniv ?: "<default>",
                sizeof(rblkcipher.geniv));
+       rblkcipher.geniv[sizeof(rblkcipher.geniv) - 1] = '\0';
  
        rblkcipher.blocksize = alg->cra_blocksize;
        rblkcipher.min_keysize = alg->cra_ablkcipher.min_keysize;
@@@ -441,8 -440,9 +442,9 @@@ static int crypto_givcipher_report(stru
        struct crypto_report_blkcipher rblkcipher;
  
        strncpy(rblkcipher.type, "givcipher", sizeof(rblkcipher.type));
 -      strncpy(rblkcipher.geniv, alg->cra_ablkcipher.geniv ?: "<built-in>",
 +      strlcpy(rblkcipher.geniv, alg->cra_ablkcipher.geniv ?: "<built-in>",
                sizeof(rblkcipher.geniv));
+       rblkcipher.geniv[sizeof(rblkcipher.geniv) - 1] = '\0';
  
        rblkcipher.blocksize = alg->cra_blocksize;
        rblkcipher.min_keysize = alg->cra_ablkcipher.min_keysize;

diff --cc crypto/blkcipher.c
index ce0013e29c63af02dd83b1a7d10fd1158de13a3b,59a0936ed8bcd47a22301804ab9125ae84fffe43..2a5e06e5053dc56a38de4ecae1d7e820eea4a905
--- 1/crypto/blkcipher.c
--- 2/crypto/blkcipher.c
+++ b/crypto/blkcipher.c
@@@ -508,8 -508,9 +508,9 @@@ static int crypto_blkcipher_report(stru
        struct crypto_report_blkcipher rblkcipher;
  
        strncpy(rblkcipher.type, "blkcipher", sizeof(rblkcipher.type));
 -      strncpy(rblkcipher.geniv, alg->cra_blkcipher.geniv ?: "<default>",
 +      strlcpy(rblkcipher.geniv, alg->cra_blkcipher.geniv ?: "<default>",
                sizeof(rblkcipher.geniv));
+       rblkcipher.geniv[sizeof(rblkcipher.geniv) - 1] = '\0';
  
        rblkcipher.blocksize = alg->cra_blocksize;
        rblkcipher.min_keysize = alg->cra_blkcipher.min_keysize;

diff --cc drivers/base/power/main.c
Simple merge

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

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

diff --cc drivers/gpio/gpiolib-of.c
Simple merge

diff --cc drivers/gpio/gpiolib.c
Simple merge

diff --cc drivers/hid/hid-core.c
index 4d2932f943aaa13b969e0e45c8984132e09e0c98,70597854397fc467a6510b40e3df8b3907c1317f..8234f80a1b10535e2d5b0b8426359be60f6fdb98
--- 1/drivers/hid/hid-core.c
--- 2/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@@ -2062,9 -2059,12 +2065,12 @@@ static const struct hid_device_id hid_h
        { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_NAVIGATION_CONTROLLER) },
        { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_BDREMOTE) },
        { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER) },
 -      { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER) },
 +/*    { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER) },*/
        { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS4_CONTROLLER) },
 -      { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS4_CONTROLLER) },
 +/*    { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS4_CONTROLLER) }, */
+       { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS4_CONTROLLER_2) },
 -      { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS4_CONTROLLER_2) },
++/*    { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS4_CONTROLLER_2) }, */
+       { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS4_CONTROLLER_DONGLE) },
        { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_VAIO_VGX_MOUSE) },
        { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_VAIO_VGP_MOUSE) },
        { HID_USB_DEVICE(USB_VENDOR_ID_SINO_LITE, USB_DEVICE_ID_SINO_LITE_CONTROLLER) },

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

diff --cc drivers/hid/hid-sony.c
index e5c1ec61d27bd094e62cfe9f06ede98e7fe2fe29,eee58d15e745ec1f2aca50fc495158fea8bc1ab4..b12a1c4509b496d2e30f9e924c22b89e4a92dedb
--- 1/drivers/hid/hid-sony.c
--- 2/drivers/hid/hid-sony.c
+++ b/drivers/hid/hid-sony.c
@@@ -2579,8 -2579,14 +2579,14 @@@ static const struct hid_device_id sony_
        /* Sony Dualshock 4 controllers for PS4 */
        { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS4_CONTROLLER),
                .driver_data = DUALSHOCK4_CONTROLLER_USB },
 -      { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS4_CONTROLLER),
 -              .driver_data = DUALSHOCK4_CONTROLLER_BT },
 +/*    { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS4_CONTROLLER),
 +              .driver_data = DUALSHOCK4_CONTROLLER_BT },*/
+       { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS4_CONTROLLER_2),
+               .driver_data = DUALSHOCK4_CONTROLLER_USB },
 -      { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS4_CONTROLLER_2),
 -              .driver_data = DUALSHOCK4_CONTROLLER_BT },
++/*    { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS4_CONTROLLER_2),
++              .driver_data = DUALSHOCK4_CONTROLLER_BT },*/
+       { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS4_CONTROLLER_DONGLE),
+               .driver_data = DUALSHOCK4_CONTROLLER_USB },
        /* Nyko Core Controller for PS3 */
        { HID_USB_DEVICE(USB_VENDOR_ID_SINO_LITE, USB_DEVICE_ID_SINO_LITE_CONTROLLER),
                .driver_data = SIXAXIS_CONTROLLER_USB | SINO_LITE_CONTROLLER },

diff --cc drivers/media/usb/uvc/uvc_video.c
Simple merge

diff --cc drivers/net/ethernet/realtek/r8169.c
Simple merge

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

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

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

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

diff --cc drivers/thermal/of-thermal.c
Simple merge

diff --cc drivers/usb/core/driver.c
Simple merge

diff --cc drivers/usb/host/xhci-hub.c
Simple merge

diff --cc drivers/usb/host/xhci-pci.c
Simple merge

diff --cc fs/ext4/super.c
Simple merge

diff --cc fs/proc/base.c
Simple merge

diff --cc fs/xattr.c
Simple merge

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

diff --cc kernel/cgroup.c
Simple merge

diff --cc kernel/sched/cputime.c
Simple merge

diff --cc kernel/sched/fair.c
Simple merge

diff --cc kernel/sched/sched.h
Simple merge

diff --cc kernel/time/alarmtimer.c
Simple merge

diff --cc lib/rhashtable.c
Simple merge

diff --cc mm/huge_memory.c
Simple merge

diff --cc mm/madvise.c
Simple merge

diff --cc mm/shmem.c
Simple merge

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

diff --cc net/netfilter/nf_nat_core.c
Simple merge

diff --cc sound/hda/hdac_controller.c
Simple merge

diff --cc sound/soc/soc-dapm.c
Simple merge