Merge Linux 4.4.260 kernel

Changes in 4.4.260: (31 commits)
        futex: Ensure the correct return value from futex_lock_pi()
        net: usb: qmi_wwan: support ZTE P685M modem
        iwlwifi: pcie: fix to correct null check
        mmc: sdhci-esdhc-imx: fix kernel panic when remove module
        scripts: use pkg-config to locate libcrypto
        scripts: set proper OpenSSL include dir also for sign-file
        hugetlb: fix update_and_free_page contig page struct assumption
        JFS: more checks for invalid superblock
        xfs: Fix assert failure in xfs_setattr_size()
        net: fix up truesize of cloned skb in skb_prepare_for_shift()
        mm/hugetlb.c: fix unnecessary address expansion of pmd sharing
        staging: fwserial: Fix error handling in fwserial_create
        x86/reboot: Add Zotac ZBOX CI327 nano PCI reboot quirk
        vt/consolemap: do font sum unsigned
        wlcore: Fix command execute failure 19 for wl12xx
        pktgen: fix misuse of BUG_ON() in pktgen_thread_worker()
        ath10k: fix wmi mgmt tx queue full due to race condition
        x86/build: Treat R_386_PLT32 relocation as R_386_PC32
        Bluetooth: Fix null pointer dereference in amp_read_loc_assoc_final_data
        staging: most: sound: add sanity check for function argument
        media: uvcvideo: Allow entities with no pads
        scsi: iscsi: Restrict sessions and handles to admin capabilities
        sysfs: Add sysfs_emit and sysfs_emit_at to format sysfs output
        scsi: iscsi: Ensure sysfs attributes are limited to PAGE_SIZE
        scsi: iscsi: Verify lengths on passthrough PDUs
        Xen/gnttab: handle p2m update errors on a per-slot basis
        xen-netback: respect gnttab_map_refs()'s return value
        zsmalloc: account the number of compacted pages correctly
        swap: fix swapfile read/write offset
        media: v4l: ioctl: Fix memory leak in video_usercopy
        Linux 4.4.260

Conflicts:
	drivers/block/zram/zram_drv.c
	mm/zsmalloc.c