Merge tag 'lsk-v3.18-15.12-android' into 'msm-3.18'

LSK Android 15.12 v3.18

* origin/tmp-3169cab0:
  arm: enable ARCH_MMAP_RND_BITS only for MMU platforms
  Revert "mmc: block: Remove call to mmc_blk_set_blksize"
  UPSTREAM: zram: fix possible use after free in zcomp_create()
  UPSTREAM: zsmalloc: fix a null pointer dereference in destroy_handle_cache()
  UPSTREAM: zram: clear disk io accounting when reset zram device
  UPSTREAM: zram: fix error return code
  UPSTREAM: zsmalloc: remove extra cond_resched() in __zs_compact
  UPSTREAM: zsmalloc: fix fatal corruption due to wrong size class selection
  UPSTREAM: zsmalloc: remove unnecessary insertion/removal of zspage in compaction
  UPSTREAM: zsmalloc: micro-optimize zs_object_copy()
  UPSTREAM: zsmalloc: remove synchronize_rcu from zs_compact()
  UPSTREAM: zram: deprecate zram attrs sysfs nodes
  UPSTREAM: zram: export new 'mm_stat' sysfs attrs
  UPSTREAM: zram: export new 'io_stat' sysfs attrs
  UPSTREAM: zram: describe device attrs in documentation
  UPSTREAM: zram: remove `num_migrated' device attr
  UPSTREAM: mm/zsmalloc.c: fix comment for get_pages_per_zspage
  UPSTREAM: zsmalloc: zsmalloc documentation
  UPSTREAM: zsmalloc: add fullness into stat
  UPSTREAM: zsmalloc: record handle in page->private for huge object
  UPSTREAM: zram: support compaction
  UPSTREAM: zsmalloc: adjust ZS_ALMOST_FULL
  UPSTREAM: zsmalloc: support compaction
  UPSTREAM: zsmalloc: factor out obj_[malloc|free]
  UPSTREAM: zsmalloc: decouple handle and object
  UPSTREAM: zram: use proper type to update max_used_pages
  UPSTREAM: mm/zsmalloc: add statistics support
  UPSTREAM: mm/zpool: add name argument to create zpool
  UPSTREAM: zram: remove request_queue from struct zram
  UPSTREAM: zram: remove init_lock in zram_make_request
  UPSTREAM: zram: check bd_openers instead of bd_holders
  UPSTREAM: zram: rework reset and destroy path
  UPSTREAM: zram: fix umount-reset_store-mount race condition
  UPSTREAM: zram: free meta table in zram_meta_free
  UPSTREAM: zram: clean up zram_meta_alloc()
  UPSTREAM: mm/zsmalloc: adjust order of functions
  UPSTREAM: zram: use DEVICE_ATTR_[RW|RO|WO] to define zram sys device attribute
  UPSTREAM: mm/zsmalloc: allocate exactly size of struct zs_pool
  UPSTREAM: mm/zsmalloc: avoid duplicate assignment of prev_class
  UPSTREAM: mm/zram: correct ZRAM_ZERO flag bit position
  UPSTREAM: mm/zsmalloc: support allocating obj with size of ZS_MAX_ALLOC_SIZE
  UPSTREAM: zsmalloc: correct fragile [kmap|kunmap]_atomic use
  UPSTREAM: zsmalloc: fix zs_init cpu notifier error handling
  UPSTREAM: zram: implement rw_page operation of zram
  UPSTREAM: zram: change parameter from vaild_io_request()
  UPSTREAM: zram: remove bio parameter from zram_bvec_rw()
  UPSTREAM: zsmalloc: merge size_class to reduce fragmentation
  arm64: kernel: Add support for Privileged Access Never
  arm64: Generalise msr_s/mrs_s operations
  arm64: kernel: Add cpufeature 'enable' callback
  arm64: kernel: Add cpuid_feature_extract_field() for 4bit sign extension
  arm64: kernel: Add min_field_value and use '>=' for feature detection
  arm64: kernel: Add optional CONFIG_ parameter to ALTERNATIVE()
  arm64: alternative: Provide if/else/endif assembler macros
  arm64: alternative: Work around .inst assembler bugs
  arm64: alternative: Merge alternative-asm.h into alternative.h
  arm64: Add AArch32 instruction set condition code checks
  arm64: lib: use pair accessors for copy_*_user routines
  arm64/uaccess: fix sparse errors
  arm64: kernel: Move config_sctlr_el1
  arm64: Emulate SETEND for AArch32 tasks
  arm64: kconfig: move emulation option under kernel features
  arm64: Consolidate hotplug notifier for instruction emulation
  arm64: fix return code check when changing emulation handler
  arm64: Trace emulation of AArch32 legacy instructions
  arm64: Emulate CP15 Barrier instructions
  arm64: Port SWP/SWPB emulation support from arm
  arm64: Add support for hooks to handle undefined instructions
  arm64: Add framework for legacy instruction emulation
  arm64: alternative: Introduce feature for GICv3 CPU interface
  arm64: Extract feature parsing code from cpu_errata.c
  arm64: alternatives: fix pr_fmt string for consistency
  arm64: Track system support for mixed endian EL0
  arm64: Provide a namespace to NCAPS
  tracing/sched: Add trace events to track cpu hotplug.
  trace: cpufreq: Add tracing for min/max cpufreq
  sched: add sched blocked tracepoint which dumps out context of sleep.
  ANDROID: android: base-cfg: disable CONFIG_SYSVIPC
  ANDROID: exec_domains: Disable request_module() call for personalities
  UPSTREAM: pagemap: do not leak physical addresses to non-privileged userspace
  configs/vexpress64: add SATA_SIL24 and SKY2 configure for Juno PCIe
  ARM: imx6sx: add imx6sx iomux-gpr field define
  ARM: imx6: correct i.MX6 PCIe interrupt routing
  ARM: imx6: allow booting with old DT
  ARM: imx6: Warn when an old DT is detected
  ARM: imx6: Allow GPC interrupts affinity to be changed
  ARM: imx6: convert GPC to stacked domains
  ARM: imx6: gpc: Add PU power domain for GPU/VPU
  ARM i.MX6q: unmap memory mapped at imx6q_opp_check_speed_grading()
  ARM: imx: support arm power off in cpuidle for i.mx6sx
  ARM: imx6: fix bogus use of irq_get_irq_data
  ARM: imx: irq: fix buggy usage of irq_data irq field
  ARM: imx: add enet init for i.mx6sx
  ARM: dts: imx6: phyFLEX: Add CAN support
  ARM: dts: imx6: phyFLEX: Add PCIe
  ARM: dts: imx6: phyFLEX: Set correct interrupt for pmic
  ARM: dts: imx6: phyFLEX: Enable gpmi in module file
  ARM: dts: imx6: phyFLEX: set nodes in alphabetical order
  ARM: dts: pbab01: enable I2S audio on phyFLEX-i.MX6 boards
  ARM: dts: pbab01: move i2c pins and frequency configuration into pfla02
  ARM: imx: Remove unneeded .map_io initialization
  ARM: dts: imx6qdl-sabresd: Fix the microphone route
  ARM: imx: refactor mxc_iomux_mode()
  ARM: imx: simplify clk_pllv3_prepare()
  ARM: imx: clean up machine mxc_arch_reset_init_dt reset init
  ARM: dts: imx6qdl-rex: Remove unneeded 'fsl,mode' property
  ARM: dts: imx6qdl-gw5x: Remove unneeded 'fsl,mode' property
  ARM: dts: imx6qdl-sabresd: Use IMX6QDL_CLK_CKO define
  PCI: Assign resources before drivers claim devices (pci_scan_root_bus())
  PCI: Assign resources before drivers claim devices (pci_scan_bus())
  wakeup: Add the guard condition for len in pm_get_active_wakeup_sources
  irqchip/gic-v3-its: Silence warning when its_lpi_alloc_chunks gets inlined
  irqchip/gic-v3-its: Add missing cache flushes
  arm64: defconfig: Enable PCI generic host bridge by default
  arm64: Juno: Add support for the PCIe host bridge on Juno R1
  Documentation: of: Document the bindings used by Juno R1 PCIe host bridge
  Documentation: bindings: Add DT bindings for ARM Juno boards.
  arm64: Add DT support for Juno r1 board.
  arm64: Juno: Add GICv2m support in device tree.
  arm64: Juno: Add memory mapped timer node
  arm64: Juno: Split juno.dts into juno-base.dtsi and juno.dts.
  arm64: Juno: Fix the GIC node address label and the frequency of FAXI clock.
  arm64: dts: add interrupt-affinity property to pmu node for juno
  arm64: juno: Fix misleading name of UART reference clock
  arm64: Add L2 cache topology to ARM Ltd boards/models
  arm64: ARM: Fix the Generic Timers interrupt active level description
  arm64: Add Juno board device tree.
  arm64: Create link to include/dt-bindings to enable C preprocessor use.
  dts, arm64: Move dts files to vendor subdirs
  PCI/MSI: Drop domain field from msi_controller
  irqchip/GICv2m: Get rid of struct msi_controller
  irqchip/gicv3-its: Make the PCI/MSI code standalone
  irqchip/gicv3-its: Get rid of struct msi_controller
  irqchip/gicv3-its: Register irq domain with NEXUS token
  irqchip/gicv3-its: Split PCI/MSI code from the core ITS driver
  genirq: Add DOMAIN_BUS_NEXUS irqdomain property
  of/platform: Assign MSI domain to platform device
  PCI: exynos: Fix INTx enablement statement termination error
  PCI: Fail pci_ioremap_bar() on unassigned resources
  PCI: Show driver, BAR#, and resource on pci_ioremap_bar() failure
  PCI: Mark invalid BARs as unassigned
  PNP: Don't check for overlaps with unassigned PCI BARs
  of: Calculate device DMA masks based on DT dma-range size
  PCI: Update DMA configuration from DT
  of/pci: Add of_pci_dma_configure() to update DMA configuration
  PCI: Add helper functions pci_get[put]_host_bridge_device()
  of: Fix size when dma-range is not used
  MFD/OF: document MFD devices and handle simple-mfd
  of: Move of_dma_configure() to device.c to help re-use
  of: iommu: Add ptr to OF node arg to of_iommu_configure()
  of/platform: teardown DMA mappings on device destruction
  dma-mapping: fix debug print to display correct dma_pfn_offset
  dma-mapping: detect and configure IOMMU in of_dma_configure
  dma-mapping: replace set_arch_dma_coherent_ops with arch_setup_dma_ops
  iommu: add new iommu_ops callback for adding an OF device
  iommu: store DT-probed IOMMU data privately
  iommu: provide helper function to configure an IOMMU for an of master
  iommu: provide early initialisation hook for IOMMU drivers
  irqchip/gicv3-its: Fix mapping of LPIs to collections
  irqchip/gicv3-its: ITS table size should not be smaller than PSZ
  irqchip: gicv3-its: Use non-cacheable accesses when no shareability
  irqchip: gicv3-its: Fix PROP/PEND and BASE/CBASE confusion
  irqchip: gicv3-its: Fix device ID encoding
  irqchip: gicv3-its: Fix encoding of collection's target redistributor
  irqchip: gicv3-its: Support safe initialization
  irqchip: gicv3-its: Define macros for GITS_CTLR fields
  irqchip: gicv3-its: Add limitation to page order
  irqchip: gicv3-its: Use 64KB page as default granule
  irqchip: gicv3-its: Zero itt before handling to hardware
  irqchip: gic-v3: Fix out of bounds access to cpu_logical_map
  irqchip: gic: Fix unsafe locking reported by lockdep
  irqchip: gic: Allow interrupt level to be set for PPIs
  irqchip: gicv3-its: Fix unsafe locking reported by lockdep
  irqchip: gicv3-its: Iterate over PCI aliases to generate ITS configuration
  irqchip: gicv3-its: Allocate enough memory for the full range of DeviceID
  irqchip: gicv3-its: Fix ITS CPU init
  irqchip: gic: Remove warning by including linux/irqdomain.h
  irqchip: gic-v2m: Add DT bindings for GICv2m
  irqchip: gic-v2m: Add support for ARM GICv2m MSI(-X) doorbell
  irqchip: mtk-sysirq: dt-bindings: Add bindings for mediatek sysirq
  irqchip: mtk-sysirq: Add sysirq interrupt polarity support
  irqchip: gic: Support hierarchy irq domain.
  genirq: Generic chip: Add big endian I/O accessors
  ARM: orion: convert the irq_reg_{readl,writel} calls to the new API
  genirq: Generic chip: Allow irqchip drivers to override irq_reg_{readl,writel}
  genirq: Generic chip: Change irq_reg_{readl,writel} arguments
  CHROMIUM: android: Unconditionally remove callbacks in sync_fence_free()
  CHROMIUM: android: fix warning when releasing active sync point
  PCI/MSI: pci-xgene-msi: Get rid of struct msi_controller
  PCI: xgene: Add APM X-Gene v1 PCIe MSI/MSIX termination driver
  PCI: generic: Add arm64 support
  PCI: Build setup-irq.o for arm64
  PCI: generic: Remove dependency on ARM-specific struct hw_pci
  PCI: generic: Convert to use generic config accessors
  PCI: Add generic config accessors
  PCI: generic: Convert to DT resource parsing API
  PCI: generic: Allocate config space windows after limiting bus number range
  pci: host: drop owner assignment from platform_drivers
  PCI/MSI: Let pci_msi_get_domain use struct device::msi_domain
  PCI/MSI: Allow msi_domain lookup using the host bridge node
  PCI/MSI: Add support for OF-provided msi_domain
  PCI: Add pci_device_to_OF_node() stub for !CONFIG_OF
  PCI/MSI: Add hooks to populate the msi_domain field
  PCI/MSI: Register irq domain with specific token
  device core: Introduce per-device MSI domain pointer
  genirq/irqdomain: Allow irq domain aliasing
  PCI: Use helper functions to access fields in struct msi_desc
  PCI: Add helper function msi_desc_to_pci_sysdata()
  genirq: Rename irq_data_get_msi() as irq_data_get_msi_desc()
  PCI/keystone: Use irq_data_get_msi_desc() to avoid redundant lookup of irq_data
  PCI/MSI: Disable MSI at enumeration even if kernel doesn't support MSI
  PCI/MSI: Export pci_msi_set_enable(), pci_msix_clear_and_set_ctrl()
  PCI/MSI: Rename msi_set_enable(), msix_clear_and_set_ctrl()
  genirq: Work around __irq_set_handler vs stacked domains ordering issues
  PCI/MSI: Rename mask/unmask_msi_irq treewide
  PCI/MSI: Kill redundant call of irq_set_msi_desc() for MSI-X interrupts
  PCI/MSI: Simplify PCI MSI code by initializing msi_desc.nvec_used earlier
  PCI/MSI: Remove unnecessary braces around single statements
  ARM/PCI: Remove unused pcibios_add_bus() and pcibios_remove_bus()
  PCI: xilinx: Save MSI controller in pci_sys_data
  PCI: mvebu: Save MSI controller in pci_sys_data
  PCI: rcar: Save MSI controller in pci_sys_data
  PCI: designware: Save MSI controller in pci_sys_data
  PCI: tegra: Save MSI controller in pci_sys_data
  ARM/PCI: Save MSI controller in pci_sys_data
  PCI/MSI: Add weak pcibios_msi_controller()
  mm: reorder can_do_mlock to fix audit denial
  staging: ion: debugfs to shrink pool
  usb: gadget: configfs: handle gadget reset request for android
  Enable adb with android-pipe in IA image
  PM / OPP: Fix typo modifcation -> modification
  PM / OPP: of_property_count_u32_elems() can return errors
  cpufreq-dt: add suspend frequency support
  PM / OPP: add dev_pm_opp_get_suspend_opp() helper
  cpufreq: dt: Tolerance applies on both sides of target voltage
  cpufreq: dt: Print error on failing to mark OPPs as shared
  cpufreq: dt: Check OPP count before marking them shared
  PM / OPP: Drop unlikely before IS_ERR(_OR_NULL)
  PM / OPP: Fix static checker warning (broken 64bit big endian systems)
  PM / OPP: Free resources and properly return error on failure
  cpufreq-dt: make scaling_boost_freqs sysfs attr available when boost is enabled
  cpufreq: dt: Add support for turbo/boost mode
  cpufreq: dt: Add support for operating-points-v2 bindings
  cpufreq: Allow drivers to enable boost support after registering driver
  Linux 3.18.24
  tty: fix stall caused by missing memory barrier in drivers/tty/n_tty.c
  Revert "tty: fix stall caused by missing memory barrier in drivers/tty/n_tty.c"
  selinux: Android kernel compatibility with M userspace
  selinux: extended permissions for ioctls
  security: add ioctl specific auditing to lsm_audit
  selinux: remove unnecessary pointer reassignment
  Revert "security: lsm_audit: add ioctl specific auditing"
  Revert "SELinux: per-command whitelisting of ioctls"
  Revert "SELinux: use deletion-safe iterator to free list"
  Revert "SELinux: ss: Fix policy write for ioctl operations"
  Linux 3.18.23
  x86: Init per-cpu shadow copy of CR4 on 32-bit CPUs too
  arm: mm: support ARCH_MMAP_RND_BITS.
  mm: mmap: Add new /proc tunable for mmap_base ASLR.
  3w-9xxx: don't unmap bounce buffered commands
  fib_rules: Fix dump_rules() not to exit early
  Don't kill IPv4 sockets when killing IPv6 sockets was requested.
  PM / OPP: add dev_pm_opp_is_turbo() helper
  PM / OPP: Add helpers for initializing CPU OPPs
  PM / OPP: Add support for opp-suspend
  PM / OPP: Add OPP sharing information to OPP library
  PM / OPP: Add clock-latency-ns support
  PM / OPP: Add support to parse "operating-points-v2" bindings
  PM / OPP: Break _opp_add_dynamic() into smaller functions
  PM / OPP: Allocate dev_opp from _add_device_opp()
  PM / OPP: Create _remove_device_opp() for freeing dev_opp
  PM / OPP: Relocate few routines
  PM / OPP: Create a directory for opp bindings
  cpufreq: Update boost flag while initializing freq table from OPPs
  cpufreq: dt: allow driver to boot automatically
  PM / OPP / clk: Remove unnecessary OOM message
  cpufreq-dt: Drop unnecessary check before cpufreq_cooling_unregister() invocation
  PM / OPP: Assert RCU lock in exported functions
  PM / OPP: Update kernel documentation
  PM / OPP: Ensure consistent naming of static functions
  PM / OPP: export dev_pm_opp_get_notifier
  cpufreq-dt: defer probing if OPP table is not ready
  PM / OPP: take RCU lock in dev_pm_opp_get_opp_count
  PM / OPP: fix warning in of_free_opp_table()
  PM / OPP: add some lockdep annotations
  PM / OPP: do error handling at the bottom of dev_pm_opp_add_dynamic()
  PM / OPP: handle allocation of device_opp in a separate routine
  PM / OPP: reuse find_device_opp() instead of duplicating code
  PM / OPP: Staticize __dev_pm_opp_remove()
  PM / OPP: replace kfree with kfree_rcu while freeing 'struct device_opp'
  PM / OPP: remove double calls to find_device_opp()
  PM / OPP: set new_opp->dev_opp to a valid dev_opp
  cpufreq-dt: free OPP table created during ->init()
  PM / OPP replace kfree_rcu() with call_srcu() in opp_set_availability()
  PM / OPP Introduce APIs to remove OPPs
  PM / OPP rename 'head' as 'rcu_head' or 'srcu_head' based on its type
  PM / OPP mark OPPs as 'static' or 'dynamic'
  PM / OPP don't match for existing OPPs when list is empty
  cpufreq-dt: register cooling device from ->ready() callback
  cpufreq: Introduce ->ready() callback for cpufreq drivers
  cpufreq-dt: pass 'policy->related_cpus' to of_cpufreq_cooling_register()
  cpufreq: Fix formatting issues in 'struct cpufreq_driver'
  cpufreq: cpufreq-dt: Move newline to end of error message
  cpufreq: cpufreq-dt: Handle regulator_get_voltage() failure
  cpufreq: cpufreq-dt: Improve debug about matching OPP
  cpufreq: drop owner assignment from platform_drivers
  vfs: Test for and handle paths that are unreachable from their mnt_root
  md: flush ->event_work before stopping array.
  x86/nmi/64: Fix a paravirt stack-clobbering bug in the NMI code
  Revert "iio: bmg160: IIO_BUFFER and IIO_TRIGGERED_BUFFER are required"
  net: Fix skb_set_peeked use-after-free bug
  mm: check if section present during memory block registering
  hpfs: update ctime and mtime on directory modification
  drivercore: Fix unregistration path of platform devices
  ARM: OMAP2+: DRA7: clockdomain: change l4per2_7xx_clkdm to SW_WKUP
  of/address: Don't loop forever in of_find_matching_node_by_address().
  auxdisplay: ks0108: fix refcount
  Doc: ABI: testing: configfs-usb-gadget-sourcesink
  Doc: ABI: testing: configfs-usb-gadget-loopback
  devres: fix devres_get()
  xtensa: fix kernel register spilling
  xtensa: fix threadptr reload on return to userspace
  KVM: MMU: fix validation of mmio page fault
  HID: usbhid: Fix the check for HID_RESET_PENDING in hid_io_error
  crypto: ghash-clmulni: specify context size for ghash async algorithm
  serial: 8250: don't bind to SMSC IrCC IR port
  usb: host: ehci-sys: delete useless bus_to_hcd conversion
  usb: dwc3: ep0: Fix mem corruption on OUT transfers of more than 512 bytes
  USB: ftdi_sio: Added custom PID for CustomWare products
  USB: symbolserial: Use usb_get_serial_port_data
  PCI: Fix TI816X class code quirk
  clk: versatile: off by one in clk_sp810_timerclken_of_get()
  staging: comedi: adl_pci7x3x: fix digital output on PCI-7230
  iio: adis16480: Fix scale factors
  iio: Add inverse unit conversion macros
  iio: industrialio-buffer: Fix iio_buffer_poll return value
  iio: event: Remove negative error code from iio_event_poll
  iio: bmg160: IIO_BUFFER and IIO_TRIGGERED_BUFFER are required
  s390/sclp: fix compile error
  drm/qxl: validate monitors config modes
  drm/amdgpu: Don't link train DisplayPort on HPD until we get the dpcd
  mm/slab: fix unexpected index mapping result of kmalloc_size(INDEX_NODE+1)
  intel_pstate: Fix overflow in busy_scaled due to long delay
  tty: fix stall caused by missing memory barrier in drivers/tty/n_tty.c
  staging: speakup: fix speakup-r regression
  dm cache: fix NULL pointer when switching from cleaner policy
  clk: ti: fix dual-registration of uart4_ick
  nfs/filelayout: Fix NULL reference caused by double freeing of fh_array
  fix a braino in ovl_d_select_inode()
  overlayfs: Make f_path always point to the overlay and f_inode to the underlay
  VFS: Introduce inode-getting helpers for layered/unioned fs environments
  overlay: Call ovl_drop_write() earlier in ovl_dentry_open()
  genirq: Fix race in register_irq_proc()
  igb: do not re-init SR-IOV during probe
  net/xen-netfront: only napi_synchronize() if running
  m68k: Define asmlinkage_protect
  arm64: readahead: fault retry breaks mmap file read random detection
  arm64: ftrace: fix function_graph tracer panic
  dcache: Handle escaped paths in prepend_path
  UBI: return ENOSPC if no enough space available
  UBI: Validate data_size
  powerpc/MSI: Fix race condition in tearing down MSI interrupts
  tools lib traceevent: Fix string handling in heterogeneous arch environments
  batman-adv: Fix potentially broken skb network header access
  batman-adv: Make TT capability changes atomic
  batman-adv: Make NC capability changes atomic
  MIPS: dma-default: Fix 32-bit fall back to GFP_DMA
  cpufreq: dt: Tolerance applies on both sides of target voltage
  USB: Add reset-resume quirk for two Plantronics usb headphones.
  usb: Add device quirk for Logitech PTZ cameras
  usb: musb: cppi41: allow it to work again
  usb: Use the USB_SS_MULT() macro to get the burst multiplier.
  usb: chipidea: udc: using the correct stall implementation
  security: fix typo in security_task_prctl
  regmap: debugfs: Don't bother actually printing when calculating max length
  regmap: debugfs: Ensure we don't underflow when printing access masks
  PM / AVS: rockchip-io: depend on CONFIG_POWER_AVS
  mtd: pxa3xx_nand: add a default chunk size
  docs: update HOWTO for 3.x -> 4.x versioning
  cifs: use server timestamp for ntlmv2 authentication
  dts: imx25: fix sd card gpio polarity specified in device tree
  dts: imx53: fix sd card gpio polarity specified in device tree
  dts: imx51: fix sd card gpio polarity specified in device tree
  batman-adv: Make DAT capability changes atomic
  batman-adv: protect tt_local_entry from concurrent delete events
  fbdev: select versatile helpers for the integrator
  ipvs: fix crash with sync protocol v0 and FTP
  ipvs: skb_orphan in case of forwarding
  ipvs: fix crash if scheduler is changed
  ipvs: do not use random local source address for tunnels
  sched/fair: Prevent throttling in early pick_next_task_fair()
  Initialize msg/shm IPC objects before doing ipc_addid()
  usb: xhci: Add support for URB_ZERO_PACKET to bulk/sg transfers
  xhci: init command timeout timer earlier to avoid deleting it uninitialized
  xhci: change xhci 1.0 only restrictions to support xhci 1.1
  usb: xhci: exit early in xhci_setup_device() if we're halted or dying
  usb: xhci: Clear XHCI_STATE_DYING on start
  USB: whiteheat: fix potential null-deref at probe
  drm/amdgpu:  Restore LCD backlight level on resume
  drm: Reject DRI1 hw lock ioctl functions for kms drivers
  drm/i915/bios: handle MIPI Sequence Block v3+ gracefully
  drm/qxl: recreate the primary surface when the bo is not primary
  drm/qxl: only report first monitor as connected if we have no state
  [SMB3] Do not fall back to SMBWriteX in set_file_size error cases
  disabling oplocks/leases via module parm enable_oplocks broken for SMB3
  nfs: fix pg_test page count calculation
  netfilter: nf_log: don't zap all loggers on unregister
  netfilter: nf_log: Introduce nft_log_dereference() macro
  netfilter: nft_compat: skip family comparison in case of NFPROTO_UNSPEC
  netfilter: nf_log: wait for rcu grace after logger unregistration
  netfilter: ctnetlink: put back references to master ct and expect objects
  netfilter: nf_conntrack: Support expectations in different zones
  netfilter: nfnetlink: work around wrong endianess in res_id field
  dm raid: fix round up of default region size
  USB: option: add ZTE PIDs
  staging: ion: fix corruption of ion_import_dma_buf
  dm btree: add ref counting ops for the leaves of top level btrees
  svcrdma: Fix send_reply() scatter/gather set-up
  ath10k: fix dma_mapping_error() handling
  Btrfs: update fix for read corruption of compressed and shared extents
  Btrfs: fix read corruption of compressed and shared extents
  btrfs: skip waiting on ordered range for special files
  ASoC: dwc: correct irq clear method
  ASoC: fix broken pxa SoC support
  ASoC: pxa: pxa2xx-ac97: fix dma requestor lines
  ALSA: hda - Apply SPDIF pin ctl to MacBookPro 12,1
  ALSA: hda: Add dock support for ThinkPad T550
  ALSA: synth: Fix conflicting OSS device registration on AWE32
  mm: hugetlbfs: skip shared VMAs when unmapping private pages to satisfy a fault
  ocfs2/dlm: fix deadlock when dispatch assert master
  spi: spi-pxa2xx: Check status register to determine if SSSR_TINT is disabled
  spi: xtensa-xtfpga: fix register endianness
  spi: Fix documentation of spi_alloc_master()
  s390/boot/decompression: disable floating point in decompressor
  s390/compat: correct uc_sigmask of the compat signal frame
  sched/core: Fix TASK_DEAD race in finish_task_switch()
  x86/xen: Support kexec/kdump in HVM guests by doing a soft reset
  x86/mm: Set NX on gap between __ex_table and rodata
  x86/process: Add proper bound checks in 64bit get_wchan()
  x86/asm/entry: Create and use a 'TOP_OF_KERNEL_STACK_PADDING' macro
  x86/kexec: Fix kexec crash in syscall kexec_file_load()
  x86/efi: Fix boot crash by mapping EFI memmap entries bottom-up at runtime, instead of top-down
  Use WARN_ON_ONCE for missing X86_FEATURE_NRIPS
  x86/paravirt: Replace the paravirt nop with a bona fide empty function
  x86/platform: Fix Geode LX timekeeping in the generic x86 build
  x86/apic: Serialize LVTT and TSC_DEADLINE writes
  dmaengine: dw: properly read DWC_PARAMS register
  ARM: dts: fix usb pin control for imx-rex dts
  ARM: dts: omap3-beagle: make i2c3, ddc and tfp410 gpio work again
  ARM: dts: omap5-uevm.dts: fix i2c5 pinctrl offsets
  windfarm: decrement client count when unregistering
  ARM: 8429/1: disable GCC SRA optimization
  ARM: fix Thumb2 signal handling when ARMv6 is enabled
  hwmon: (nct6775) Swap STEP_UP_TIME and STEP_DOWN_TIME registers for most chips
  sched: access local runqueue directly in single_task_running
  watchdog: sunxi: fix activation of system reset
  perf header: Fixup reading of HEADER_NRCPUS feature
  perf stat: Get correct cpu id for print_aggr
  perf report: Add support for srcfile sort key
  perf tools: Fix copying of /proc/kcore
  iser-target: remove command with state ISTATE_REMOVE
  scsi: fix scsi_error_handler vs. scsi_host_dev_release race
  target/iscsi: Fix np_ip bracket issue by removing np_ip
  time: Fix timekeeping_freqadjust()'s incorrect use of abs() instead of abs64()
  kvm: fix double free for fast mmio eventfd
  kvm: factor out core eventfd assign/deassign logic
  kvm: fix zero length mmio searching
  kvm: don't try to register to KVM_FAST_MMIO_BUS for non mmio eventfd
  arm: KVM: Fix incorrect device to IPA mapping
  hp-wmi: limit hotkey enable
  zram: fix possible use after free in zcomp_create()
  of_mdio: add new DT property 'managed' to specify the PHY management type
  net: dsa: bcm_sf2: Do not override speed settings
  tcp: add proper TS val into RST packets
  net: dsa: bcm_sf2: Fix 64-bits register writes
  net: eth: altera: fix napi poll_list corruption
  ext4: don't manipulate recovery flag when freezing no-journal fs
  cxl: Fix unbalanced pci_dev_get in cxl_probe
  igb: Fix oops caused by missing queue pairing
  rtlwifi: rtl8821ae: Fix an expression that is always false
  x86/nmi/64: Use DF to avoid userspace RSP confusing nested NMI detection
  x86/nmi/64: Reorder nested NMI checks
  x86/nmi/64: Improve nested NMI comments
  bna: fix interrupts storm caused by erroneous packets
  udp: fix dst races with multicast early demux
  packet: missing dev_put() in packet_do_bind()
  fib_rules: fix fib rule dumps across multiple skbs
  openvswitch: Zero flows on allocation.
  sctp: fix race on protocol/netns initialization
  netlink, mmap: transform mmap skb into full skb on taps
  net/ipv6: Correct PIM6 mrt_lock handling
  ipv6: fix exthdrs offload registration in out_rt path
  usbnet: Get EVENT_NO_RUNTIME_PM bit before it is cleared
  ip6_gre: release cached dst on tunnel removal
  rtnetlink: verify IFLA_VF_INFO attributes before passing them to driver
  if_link: Add an additional parameter to ifla_vf_info for RSS querying
  uid_cputime: Check for the range while removing range of UIDs.
  linaro-base.conf: remove CONFIG_NFS_V2 is not set
  usb: gadget: Remove circular dependency on Config
  android: drivers: workaround debugfs race in binder
  staging: ion: Add X86 dependency for ION_POOL_CACHE_POLICY
  staging: ion: fix corruption of ion_import_dma_buf
  Revert "staging: binder: Change binder mutex to rtmutex."
  UPSTREAM: arm64: add better page protections to arm64
  UPSTREAM: arm64: use fixmap for text patching
  UPSTREAM: arm64: remove the unnecessary arm64_swiotlb_init()
  UPSTREAM: arm64/efi: remove idmap manipulations from UEFI code
  UPSTREAM: arm64/efi: add missing call to early_ioremap_reset()
  UPSTREAM: arm64/efi: remove free_boot_services() and friends
  UPSTREAM: arm64/efi: move SetVirtualAddressMap() to UEFI stub
  UPSTREAM: arm64/efi: set EFI_ALLOC_ALIGN to 64 KB
  UPSTREAM: efi: efistub: allow allocation alignment larger than EFI_PAGE_SIZE
  UPSTREAM: efi: split off remapping code from efi_config_init()
  UPSTREAM: arm64/mm: add create_pgd_mapping() to create private page tables
  UPSTREAM: arm64/mm: add explicit struct_mm argument to __create_mapping()
  UPSTREAM: efi: efi-stub: notify on DTB absence
  UPSTREAM: arm64: dmi: set DMI string as dump stack arch description
  UPSTREAM: arm64: dmi: Add SMBIOS/DMI support
  UPSTREAM: dmi: add support for SMBIOS 3.0 64-bit entry point
  UPSTREAM: efi: dmi: add support for SMBIOS 3.0 UEFI configuration table
  UPSTREAM: arm64/efi: drop redundant set_bit(EFI_CONFIG_TABLES)
  UPSTREAM: arm64/efi: invert UEFI memory region reservation logic
  UPSTREAM: arm64/efi: set PE/COFF file alignment to 512 bytes
  UPSTREAM: arm64/efi: set PE/COFF section alignment to 4 KB
  UPSTREAM: arm64/efi: efistub: jump to 'stext' directly, not through the header
  UPSTREAM: arm64: Move some head.text functions to executable section
  UPSTREAM: arm64: jump labels: NOP out NOP -> NOP replacement
  UPSTREAM: arm64: add support to dump the kernel page tables
  UPSTREAM: arm64: Add FIX_HOLE to permanent fixed addresses
  UPSTREAM: arm64: Factor out fixmap initialization from ioremap
  UPSTREAM: arm64: Move cpu_resume into the text section
  UPSTREAM: arm64: Switch to adrp for loading the stub vectors
  UPSTREAM: arm64: Treat handle_arch_irq as a function pointer
  hfs,hfsplus: cache pages correctly between bnode_create and bnode_free
  IB/mlx4: Use correct SL on AH query under RoCE
  IB/mlx4: Forbid using sysfs to change RoCE pkeys
  IB/uverbs: Fix race between ib_uverbs_open and remove_one
  IB/uverbs: reject invalid or unknown opcodes
  IB/qib: Change lkey table allocation to support more MRs
  hfs: fix B-tree corruption after insertion at position 0
  md/raid10: always set reshape_safe when initializing reshape_position.
  mmc: core: fix race condition in mmc_wait_data_done
  fs: if a coredump already exists, unlink and recreate with O_EXCL
  vmscan: fix increasing nr_isolated incurred by putback unevictable pages
  parisc: Filter out spurious interrupts in PA-RISC irq handler
  parisc: Use double word condition in 64bit CAS operation
  NFS: nfs_set_pgio_error sometimes misses errors
  NFS: Fix a NULL pointer dereference of migration recovery ops for v4.2 client
  NFSv4: don't set SETATTR for O_RDONLY|O_EXCL
  Btrfs: check if previous transaction aborted to avoid fs corruption
  [media] v4l: omap3isp: Fix sub-device power management code
  [media] rc-core: fix remove uevent generation
  x86/mm: Initialize pmd_idx in page_table_range_init_count()
  Add radeon suspend/resume quirk for HP Compaq dc5750.
  CIFS: fix type confusion in copy offload ioctl
  powerpc/mm: Recompute hash value after a failed update
  powerpc/rtas: Introduce rtas_get_sensor_fast() for IRQ handlers
  powerpc/mm: Fix pte_pagesize_index() crash on 4K w/64K hash
  ALSA: hda - Use ALC880_FIXUP_FUJITSU for FSC Amilo M1437
  ALSA: hda - Enable headphone jack detect on old Fujitsu laptops
  Input: evdev - do not report errors form flush()
  arm64: KVM: Disable virtual timer even if the guest is not using it
  arm64: errata: add module build workaround for erratum #843419
  arm64: head.S: initialise mdcr_el2 in el2_setup
  arm64: compat: fix vfp save/restore across signal handlers in big-endian
  arm64: kconfig: Move LIST_POISON to a safe value
  mac80211: enable assoc check for mesh interfaces
  tg3: Fix temperature reporting
  unshare: Unsharing a thread does not require unsharing a vm
  blk-mq: fix buffer overflow when reading sysfs file of 'pending'
  Squashfs: Add LZ4 compression configuration option
  Squashfs: add LZ4 compression support
  lz4: fix system halt at boot kernel on x86_64
  lib/lz4: Pull out constant tables
  LZ4 : fix the data abort issue
  arm64: pass return address to dma_common_contiguous_remap
  Initialize msg/shm IPC objects before doing ipc_addid()
  Linux 3.18.22
  lowmemorykiller: trace kill events.
  selinux: do not check open perm on ftruncate call
  Revert "HACK: usb: gadget: Fix enumeration on boot"
  ipv6: sysctl to restrict candidate source addresses
  ipv6: Remove unused arguments for __ipv6_dev_get_saddr().
  ipv6: Fix finding best source address in ipv6_dev_get_saddr().
  ipv6: Do not iterate over all interfaces when finding source address on specific interface.
  net: ipv6: allow explicitly choosing optimistic addresses
  net: ipv6: Add a sysctl to make optimistic addresses useful candidates
  Revert "net: ipv6: Add a sysctl to make optimistic addresses useful candidates"
  Revert "net: ipv6: allow choosing optimistic addresses with use_optimistic"
  net: ping: Return EAFNOSUPPORT when appropriate.
  net: core: fix UID-based routing build
  android: configs: base: enable IPV6
  Handle 'sk' being NULL in UID-based routing.
  net: call rcu_read_lock early in process_backlog
  lpfc: Fix scsi prep dma buf error.
  rds: fix an integer overflow test in rds_info_getsockopt()
  net/mlx4_core: Fix wrong index in propagating port change event to VFs
  netlink: don't hold mutex in rcu callback when releasing mmapd ring
  inet: frags: fix defragmented packet's IP header for af_packet
  bonding: correct the MAC address for "follow" fail_over_mac policy
  bonding: fix destruction of bond with devices different from arphrd_ether
  ipv6: lock socket in ip6_datagram_connect()
  isdn/gigaset: reset tty->receive_room when attaching ser_gigaset
  bridge: mdb: fix double add notification
  net: Fix skb csum races when peeking
  net: do not process device backlog during unregistration
  net: pktgen: fix race between pktgen_thread_worker() and kthread_stop()
  bridge: mdb: zero out the local br_ip variable before use
  net/tipc: initialize security state for new connection socket
  ip_tunnel: fix ipv4 pmtu check to honor inner ip header df
  net: graceful exit from netif_alloc_netdev_queues()
  ipv6: Make MLD packets to only be processed locally
  drm/radeon: fix hotplug race at startup
  mfd: lpc_ich: Assign subdevice ids automatically
  x86/ldt: Correct LDT access in single stepping logic
  x86/ldt: Make modify_ldt synchronous
  rcu: Move lockless_dereference() out of rcupdate.h
  x86/nmi/64: Switch stacks on userspace NMI entry
  x86/nmi/64: Remove asm code that saves CR2
  x86/nmi: Enable nested do_nmi() handling for 64-bit kernels
  HID: usbhid: add Chicony/Pixart usb optical mouse that needs QUIRK_ALWAYS_POLL
  SCSI: Fix NULL pointer dereference in runtime PM
  UPSTREAM: ARM: 8425/1: kgdb: Don't try to stop the machine when setting breakpoints
  UPSTREAM: ARM: mm: allow text and rodata sections to be read-only
  BACKPORT: ARM: mm: allow non-text sections to be non-executable
  UPSTREAM: arm: kgdb: Handle read-only text / modules
  UPSTREAM: ARM: kexec: Make .text R/W in machine_kexec
  UPSTREAM: arm: use fixmap for text patching when text is RO
  UPSTREAM: arm: fixmap: implement __set_fixmap()
  UPSTREAM: ARM: expand fixmap region to 3MB
  UPSTREAM: arm: use generic fixmap.h
  of/platform: Move platform devices under /sys/devices/platform
  ALSA: usb: Add native DSD support for Gustard DAC-X20U
  net: PPPoPNS: Remove length argument from data_ready
  dm-verity: Add modes and emit uevent on corrupted blocks
  ARM64 readahead: fault retry breaks mmap file read random detection
  x86/xen: make CONFIG_XEN depend on CONFIG_X86_LOCAL_APIC
  arm64: KVM: Fix host crash when injecting a fault into a 32bit guest
  Add factory recertified Crucial M500s to blacklist
  cpuset: use trialcs->mems_allowed as a temp variable
  crypto: caam - fix memory corruption in ahash_final_ctx
  sd: Fix maximum I/O size for BLOCK_PC requests
  libiscsi: Fix host busy blocking during connection teardown
  MIPS: Fix seccomp syscall argument for MIPS64
  regmap: regcache-rbtree: Clean new present bits on present bitmap resize
  mfd: arizona: Fix initialisation of the PM runtime
  libfc: Fix fc_fcp_cleanup_each_cmd()
  libfc: Fix fc_exch_recv_req() error path
  drm/vmwgfx: Fix execbuf locking issues
  drm/radeon: add new OLAND pci id
  EDAC, ppc4xx: Access mci->csrows array elements properly
  localmodconfig: Use Kbuild files too
  dm thin metadata: delete btrees when releasing metadata snapshot
  x86/xen: build "Xen PV" APIC driver for domU as well
  rtlwifi: rtl8723be: Add module parameter for MSI interrupts
  perf: Fix PERF_EVENT_IOC_PERIOD migration race
  perf: Fix fasync handling on inherited events
  xen-blkback: replace work_pending with work_busy in purge_persistent_gnt()
  xen-blkfront: don't add indirect pages to list when !feature_persistent
  mm/hwpoison: fix fail isolate hugetlbfs page w/ refcount held
  mm: hugetlb: introduce page_huge_active
  mm/hwpoison: fix page refcount of unknown non LRU page
  ipc/sem.c: update/correct memory barriers
  ipc,sem: fix use after free on IPC_RMID after a task using same semaphore set exits
  crypto: arm/sha256 - Add optimized SHA-256/224
  net: sysctl_net_core: delete unused variable
  usb: gadget: configfs: fix unused variable warnings
  net: PPPoPNS: Remove length argument from data_ready
  usb: gadget: function: fix unused function warnings
  android: configs: base: enable Android gadget functions
  usb: gadget: audio_source function depends on SND_PCM
  tcp: Silence warning: <E2><80><98>in<E2><80><99> may be used uninitialized
  drivers/base: cpu: fix CPU_AUTOPROBE
  of/fdt: fix build warnings in early_init_dt_scan_chosen()
  thermal: power_allocator: allocate with kcalloc what you free with kfree
  thermal: power_allocator: do not use devm* interfaces
  thermal: cpu_cooling: Check memory allocation of power_table
  net: fix crash in tcp_nuke_addr()
  net: xt_qtaguid/xt_socket: fix refcount underflow and crash
  net: fix iterating over hashtable in tcp_nuke_addr()
  nf: IDLETIMER: fix lockdep warning
  ANDROID: usb: gadget: create F_midi device
  usb: gadget: midi: avoid redundant f_midi_set_alt() call
  usb: gadget: f_midi: fix error recovery path
  usb: gadget: f_midi: fix segfault when reading empty id
  usb: gadget: fix misspelling of current function in string
  usb: gadget: midi: f_midi_alloc() can be static
  usb: gadget: f_midi: add configfs support
  usb: gadget: f_midi: use usb_gstrings_attach
  usb: gadget: f_midi: remove compatibility layer
  usb: gadget: f_midi: convert to new function interface with backward compatibility
  usb: gadget: f_midi: check kstrdup() return value
  usb: gadget: f_midi: enable use of the index parameter
  usb: gadget: configfs: Fix interfaces array NULL-termination
  usb: gadget: Add device attribute to determine gadget state
  x86/xen: Initialize cr4 shadow for 64-bit PV(H) guests
  usb: phy: fix dual role sysfs build if kernel modules are supported
  ion: Handle the memory mapping correctly on x86
  usb: phy: Dual role sysfs class definition
  Linux 3.18.21
  ip_vti/ip6_vti: Preserve skb->mark after rcv_cb call
  xfrm: Override skb->mark with tunnel->parm.i_key in xfrm_input
  ip_vti/ip6_vti: Do not touch skb->mark on xmit
  libata: Do not blacklist M510DC
  libata: force disable trim for SuperSSpeed S238
  libata: add ATA_HORKAGE_NOTRIM
  libata: Expose TRIM capability in sysfs
  libata: Do not blacklist Micron M500DC
  libata: Blacklist queued TRIM on all Samsung 800-series
  libata: Blacklist queued TRIM on Samsung SSD 850 Pro
  libata: Update Crucial/Micron blacklist
  libata: Whitelist SSDs that are known to properly return zeroes after TRIM
  Revert "libata: add ATA_HORKAGE_NOTRIM"
  hpfs: hpfs_error: Remove static buffer, use vsprintf extension %pV instead
  intel_idle: support additional Broadwell model
  kexec: allocate the kexec control page with KEXEC_CONTROL_MEMORY_GFP
  i2c: i801: Add DeviceIDs for SunrisePoint LP
  ALSA: hda/hdmi - apply Haswell fix-ups to Skylake display codec
  ALSA: hda - add codec ID for Skylake display audio codec
  iio: accel: hid-sensor-accel-3d: Fix memory leak in probe()
  iio: gyro: hid-sensor-gyro-3d: Fix memory leak in probe()
  iio: light: hid-sensor-als.c: Fix memory leak in probe()
  thermal: rcar: fix ENR register value
  arm64/mm: Remove hack in mmap randomize layout
  Bluetooth: ath3k: Add a new ID 0cf3:e006 to ath3k list
  HID: do not bind to Microchip Pick16F1454
  [media] si4713: HID blacklist Si4713 USB development board
  HID: tivo: enable all buttons on the TiVo Slide Pro remote
  hpsa: fix a couple pci id table mistakes
  cpufreq: pcc: Enable autoload of pcc-cpufreq for ACPI processors
  usb: renesas_usbhs: Don't disable the pipe if Control write status stage
  usb: renesas_usbhs: Fix fifo unclear in usbhsf_prepare_pop
  btrfs: cleanup orphans while looking up default subvolume
  btrfs: incorrect handling for fiemap_fill_next_extent return
  iio: adc: twl6030-gpadc: Fix modalias
  md/bitmap: return an error when bitmap superblock is corrupt.
  sg_start_req(): make sure that there's not too many elements in iovec
  iscsi-target: Fix iscsit_start_kthreads failure OOPs
  ima: extend "mask" policy matching support
  ima: add support for new "euid" policy condition
  iscsi-target: Fix iser explicit logout TX kthread leak
  iscsi-target: Fix use-after-free during TPG session shutdown
  avr32: handle NULL as a valid clock object
  vhost: actually track log eventfd file
  rds: rds_ib_device.refcount overflow
  x86/efi: Use all 64 bit of efi_memmap in setup_e820()
  xhci: do not report PLC when link is in internal resume state
  xhci: prevent bus_suspend if SS port resuming in phase 1
  xhci: Calculate old endpoints correctly on device reset
  usb-storage: ignore ZTE MF 823 card reader in mode 0x1225
  ata: pmp: add quirk for Marvell 4140 SATA PMP
  blkcg: fix gendisk reference leak in blkg_conf_prep()
  Input: usbtouchscreen - avoid unresponsive TSC-30 touch screen
  tile: use free_bootmem_late() for initrd
  md/raid1: fix test for 'was read error from last working device'.
  mmc: sdhci-esdhc: Make 8BIT bus work
  mac80211: clear subdir_stations when removing debugfs
  st: null pointer dereference panic caused by use after kref_put by st_open
  ALSA: hda - Fix MacBook Pro 5,2 quirk
  ALSA: usb-audio: add dB range mapping for some devices
  ALSA: usb-audio: Add MIDI support for Steinberg MI2/MI4
  genirq: Prevent resend to interrupts marked IRQ_NESTED_THREAD
  s390/sclp: clear upper register halves in _sclp_print_early
  freeing unlinked file indefinitely delayed
  ACPI / init: Switch over platform to the ACPI mode later
  nfsd: do nfs4_check_fh in nfs4_check_file instead of nfs4_check_olstateid
  nfsd: refactor nfs4_preprocess_stateid_op
  kvm: x86: fix kvm_apic_has_events to check for NULL pointer
  signal: fix information leak in copy_siginfo_from_user32
  signal: fix information leak in copy_siginfo_to_user
  signalfd: fix information leak in signalfd_copyinfo
  mm, vmscan: Do not wait for page writeback for GFP_NOFS allocations
  mtd: nand: Fix NAND_USE_BOUNCE_BUFFER flag conflict
  USB: qcserial: Add support for Dell Wireless 5809e 4G Modem
  USB: qcserial/option: make AT URCs work for Sierra Wireless MC7305/MC7355
  usb: gadget: f_uac2: fix calculation of uac2->p_interval
  md/raid1: extend spinlock to protect raid1_end_read_request against inconsistencies
  PCI: Restore PCI_MSIX_FLAGS_BIRMASK definition
  nfsd: Drop BUG_ON and ignore SECLABEL on absent filesystem
  ocfs2: fix BUG in ocfs2_downconvert_thread_do_work()
  ipc: modify message queue accounting to not take kernel data structures into account
  hwmon: (dell-smm) Blacklist Dell Studio XPS 8100
  ALSA: fireworks/firewire-lib: add support for recent firmware quirk
  ALSA: hda - fix cs4210_spdif_automute()
  ARM: OMAP2+: hwmod: Fix _wait_target_ready() for hwmods without sysc
  ARM: dts: i.MX35: Fix can support.
  rbd: fix copyup completion race
  crypto: ixp4xx - Remove bogus BUG_ON on scattered dst buffer
  crypto: qat - Fix invalid synchronization between register/unregister sym algs
  hwrng: core - correct error check of kthread_run call
  xen/gntdevt: Fix race condition in gntdev_release()
  xen/gntdev: convert priv->lock to a mutex
  arm64 Kconfig: Move LIST_POISON to a safe value
  ion : In carveout heap, change minimum allocation order from 12 to PAGE_SHIFT, After this change each bit in bitmap (genalloc -  General purpose special memory pool)
  x86/xen: Probe target addresses in set_aliased_prot() before the hypercall
  ASoC: dapm: Lock during userspace access
  ASoC: pcm1681: Fix setting de-emphasis sampling rate selection
  ARM: dts: keystone: fix dt bindings to use post div register for mainpll
  clk: keystone: add support for post divider register for main pll
  sparc64: Fix userspace FPU register corruptions.
  Fix for in kernel emergency remount when loop mounts are used
  md: use kzalloc() when bitmap is disabled
  phy: twl4030-usb: make runtime pm more reliable.
  pstore: pmsg: return -ENOMEM on vmalloc failure
  usb: udc: core: add device_del() call to error pathway
  USB: sierra: add 1199:68AB device ID
  drivers/usb: Delete XHCI command timer if necessary
  xhci: fix off by one error in TRB DMA address boundary check
  ipr: Fix invalid array indexing for HRRQ
  ipr: Fix incorrect trace indexing
  ipr: Fix locking for unit attention handling
  drm/dp-mst: Remove debug WARN_ON
  drm/radeon/combios: add some validation of lvds values
  drm/i915: Replace WARN inside I915_READ64_2x32 with retry loop
  fsnotify: fix oops in fsnotify_clear_marks_by_group_flags()
  MIPS: Make set_pte() SMP safe.
  MIPS: Flush RPS on kernel entry with EVA
  MIPS: show_stack: Fix stack trace with EVA
  MIPS: do_mcheck: Fix kernel code dump with EVA
  MIPS: Fix sched_getaffinity with MT FPAFF enabled
  MIPS: Malta: Don't reinitialise RTC
  wakeup_reason: use vsnprintf instead of snsprintf for vargs.

  The USB and Display related changes are skipped completely based
  on review by those teams.

  Certain memory, UBI and MMC related changes are not picked based
  on review by those teams.

  Certain missing parts of commit e7cf05db ("netfilter: xt_socket: add
  XT_SOCKET_RESTORESKMARK flag") are added back.

  Skip "android: add CONFIG_DEBUG_RODATA to recommended config".
  CONFIG_DEBUG_RODATA is only needed on perf so avoid mandating
  it for perf and debug.

Conflicts:
	arch/arm/include/asm/cacheflush.h
	arch/arm/include/asm/fixmap.h
	arch/arm/kernel/kgdb.c
	arch/arm/kernel/vmlinux.lds.S
	arch/arm/mm/highmem.c
	arch/arm/mm/init.c
	arch/arm/mm/mmap.c
	arch/arm/mm/mmu.c
	arch/arm64/Kconfig.debug
	arch/arm64/include/asm/cacheflush.h
	arch/arm64/include/asm/cpufeature.h
	arch/arm64/include/asm/efi.h
	arch/arm64/include/asm/mmu.h
	arch/arm64/kernel/efi.c
	arch/arm64/kernel/head.S
	arch/arm64/kernel/setup.c
	arch/arm64/kernel/vmlinux.lds.S
	arch/arm64/lib/copy_from_user.S
	arch/arm64/lib/copy_in_user.S
	arch/arm64/lib/copy_to_user.S
	arch/arm64/mm/Makefile
	arch/arm64/mm/dma-mapping.c
	arch/arm64/mm/dump.c
	arch/arm64/mm/mm.h
	arch/arm64/mm/mmap.c
	arch/arm64/mm/mmu.c
	drivers/base/firmware_class.c
	drivers/base/power/opp.c
	drivers/block/zram/zram_drv.c
	drivers/irqchip/Kconfig
	drivers/irqchip/Makefile
	drivers/irqchip/irq-gic-common.c
	drivers/irqchip/irq-gic-common.h
	drivers/irqchip/irq-gic-v3-its.c
	drivers/irqchip/irq-gic-v3.c
	drivers/irqchip/irq-gic.c
	drivers/mmc/card/block.c
	drivers/mmc/core/core.c
	drivers/of/platform.c
	drivers/pci/msi.c
	drivers/scsi/scsi_pm.c
	drivers/staging/android/ion/Kconfig
	drivers/staging/android/ion/ion.c
	drivers/staging/android/ion/ion_page_pool.c
	drivers/staging/android/ion/ion_priv.h
	drivers/staging/android/ion/ion_system_heap.c
	drivers/staging/android/lowmemorykiller.c
	drivers/staging/android/sync.c
	drivers/usb/gadget/Kconfig
	drivers/usb/gadget/configfs.c
	drivers/usb/gadget/function/f_midi.c
	include/linux/iommu.h
	include/linux/ipv6.h
	include/linux/irqchip/arm-gic-v3.h
	include/linux/msi.h
	include/trace/events/power.h
	include/trace/events/sched.h
	include/uapi/linux/ipv6.h
	kernel/irq/proc.c
	kernel/sysctl.c
	net/ipv4/tcp.c
	net/ipv6/addrconf.c
	net/netfilter/xt_socket.c

Change-Id: I91e89f6ccae8d06b7b6712590015236b35c6939c
Signed-off-by: Kaushal Kumar <kaushalk@codeaurora.org>