summaryrefslogtreecommitdiff
path: root/include
AgeCommit message (Collapse)Author
2017-05-15msm: Initial ais driver for automotive cameraTerence Ho
Initial driver directory setup for automotive imaging subsystem - ais. The camera kernel drivers for mobile and automotive platforms have been decoupled and placed in separate directories as automotive usecases will require significant divergence from mobile drivers. The changes to the imaging pipeline drivers enable automotive imaging subsystem interface from userspace. This snapshot is taken as of msm-3.18 'commit c3d5931bbc51 ("msm: Initial ais driver for automotive camera")' Change-Id: I49b8e827818994d0a8b320ffe92f8031ffbb69ca Signed-off-by: Terence Ho <terenceh@codeaurora.org> Signed-off-by: Andy Sun <bins@codeaurora.org>
2017-05-05Merge "msm: mdss: Add multi-rectangle validation support"Linux Build Service Account
2017-05-03Merge "msm: camera: ispif: extend interface with line width"Linux Build Service Account
2017-05-03Merge "iommu/iommu-debug: Add validation support for per-buffer coherent ↵Linux Build Service Account
mappings"
2017-05-03Merge "Merge branch 'android-4.4@e4528dd' into branch 'msm-4.4'"Linux Build Service Account
2017-05-03Merge "soc: qcom: minidump: move elf global variables to structure"Linux Build Service Account
2017-05-03Merge "regulator: onsemi-ncp6335d: Fix compilation issues"Linux Build Service Account
2017-05-03Merge "profiler: Reorder the bandwidth counter structure"Linux Build Service Account
2017-05-03soc: qcom: minidump: move elf global variables to structureLingutla Chandrasekhar
Current driver implementation uses global variables to create minidump elf header. Move all elf global variables into a structure, and also replace 'msm_minidump_enabled' API with 'minidump_enabled' global variable. And also add minidump_table address in elf, which would be useful for parsers to get memory dump table addresses without vmlinux symbols. Change-Id: I8829d88ce234179f429ae9537a3582df794c2cdf Signed-off-by: Lingutla Chandrasekhar <clingutla@codeaurora.org>
2017-05-03drivers: regulator: Add snapshot of OnSemi NCP6335D regulatorAnirudh Ghayal
This is snapshot of the OnSemi NCP6335D driver as of msm-3.10 'commit 156ba1726643 ("regulator: onsemi-ncp6335d: Add i2c retry logic")'. Change-Id: I4cf0acd272fcf498462d4397385cd62f144eadf8 Signed-off-by: Kiran Gunda <kgunda@codeaurora.org>
2017-05-02iommu/iommu-debug: Add validation support for per-buffer coherent mappingsSudarshan Rajagopalan
Added new debugfs files/nodes to perform basic validation of the per-buffer IO coherent dma-mapping that was recently implemented. Also, added a node to print out the PTE for a given IOVA. Nodes added: dma_attach dma_map dma_unmap dma_atos virt_addr pte Change-Id: I041ab5f4e37e50dd3f58e2def3fdd3125a60629c Signed-off-by: Sudarshan Rajagopalan <sudaraja@codeaurora.org>
2017-05-02Merge "Merge remote-tracking branch 'remotes/quic/dev/msm-4.4-8996au' into ↵Linux Build Service Account
msm-4.4"
2017-05-02Merge "clk: Add support to dump state of all clocks into ftrace"Linux Build Service Account
2017-05-02Merge "esoc: Add provision to handle shutdown request in userspace"Linux Build Service Account
2017-05-02Merge "soc: qcom: ssr: Add option to relax on ssr failures"Linux Build Service Account
2017-05-02Merge branch 'android-4.4@e4528dd' into branch 'msm-4.4'Blagovest Kolenichev
* refs/heads/tmp-e4528dd: Linux 4.4.65 perf/core: Fix concurrent sys_perf_event_open() vs. 'move_group' race ping: implement proper locking staging/android/ion : fix a race condition in the ion driver vfio/pci: Fix integer overflows, bitmask check tipc: check minimum bearer MTU netfilter: nfnetlink: correctly validate length of batch messages xc2028: avoid use after free mnt: Add a per mount namespace limit on the number of mounts tipc: fix socket timer deadlock tipc: fix random link resets while adding a second bearer gfs2: avoid uninitialized variable warning hostap: avoid uninitialized variable use in hfa384x_get_rid tty: nozomi: avoid a harmless gcc warning tipc: correct error in node fsm tipc: re-enable compensation for socket receive buffer double counting tipc: make dist queue pernet tipc: make sure IPv6 header fits in skb headroom ANDROID: uid_sys_stats: fix access of task_uid(task) BACKPORT: f2fs: sanity check log_blocks_per_seg Linux 4.4.64 tipc: fix crash during node removal block: fix del_gendisk() vs blkdev_ioctl crash x86, pmem: fix broken __copy_user_nocache cache-bypass assumptions hv: don't reset hv_context.tsc_page on crash Drivers: hv: balloon: account for gaps in hot add regions Drivers: hv: balloon: keep track of where ha_region starts Tools: hv: kvp: ensure kvp device fd is closed on exec kvm: arm/arm64: Fix locking for kvm_free_stage2_pgd x86/mce/AMD: Give a name to MCA bank 3 when accessed with legacy MSRs powerpc/kprobe: Fix oops when kprobed on 'stdu' instruction ubi/upd: Always flush after prepared for an update mac80211: reject ToDS broadcast data frames mmc: sdhci-esdhc-imx: increase the pad I/O drive strength for DDR50 card ACPI / power: Avoid maybe-uninitialized warning Input: elantech - add Fujitsu Lifebook E547 to force crc_enabled VSOCK: Detach QP check should filter out non matching QPs. Drivers: hv: vmbus: Reduce the delay between retries in vmbus_post_msg() Drivers: hv: get rid of timeout in vmbus_open() Drivers: hv: don't leak memory in vmbus_establish_gpadl() s390/mm: fix CMMA vs KSM vs others CIFS: remove bad_network_name flag cifs: Do not send echoes before Negotiate is complete ring-buffer: Have ring_buffer_iter_empty() return true when empty tracing: Allocate the snapshot buffer before enabling probe KEYS: fix keyctl_set_reqkey_keyring() to not leak thread keyrings KEYS: Change the name of the dead type to ".dead" to prevent user access KEYS: Disallow keyrings beginning with '.' to be joined as session keyrings ANDROID: sdcardfs: Call lower fs's revalidate ANDROID: sdcardfs: Avoid setting GIDs outside of valid ranges ANDROID: sdcardfs: Copy meta-data from lower inode Revert "Revert "Android: sdcardfs: Don't do d_add for lower fs"" ANDROID: sdcardfs: Use filesystem specific hash ANDROID: AVB error handler to invalidate vbmeta partition. ANDROID: Update init/do_mounts_dm.c to the latest ChromiumOS version. Revert "[RFC]cgroup: Change from CAP_SYS_NICE to CAP_SYS_RESOURCE for cgroup migration permissions" Conflicts: drivers/md/Makefile Change-Id: I8f5ed53cb8b6cc66914f10c6ac820003b87b8759 Signed-off-by: Blagovest Kolenichev <bkolenichev@codeaurora.org>
2017-05-01Merge "power_supply: Add REAL_TYPE power_supply_property"Linux Build Service Account
2017-05-01Merge "esoc: mdm-4x: Add support for mdm9x45 and apq8096"Linux Build Service Account
2017-05-02esoc: Add provision to handle shutdown request in userspaceArun KS
In certain scenarios, modem shutdown requests are handled in userspace. Enhance request engine of esoc driver to send shutdown requests to userspace. Also, during a shutdown, avoid setting status to 0, if line is not a power source. There can be multiple mdms monitoring status line. This can otherwise be misinterpreted as an unexpected reset by other mdms. Change-Id: I9c20a86e76f892cc61dbfb814202b26e5cce3e96 Signed-off-by: Arun KS <arunks@codeaurora.org> Signed-off-by: Srivatsa Vaddagiri <vatsa@codeaurora.org>
2017-05-02soc: qcom: ssr: Add option to relax on ssr failuresArun KS
SSR failures are considered fatal and results in system panic. In certain scenarios system can continue to work even with a failed subsystem. Add an option in subsystem descriptor to relax on ssr failures. Change-Id: I86dcaa615d6443937077880d9a91070d9c22ea1f Signed-off-by: Arun KS <arunks@codeaurora.org> [satyap@codeaurora.org: trivial merge conflict resolution] Signed-off-by: Satya Durga Srinivasu Prabhala <satyap@codeaurora.org>
2017-05-02clk: Add support to dump state of all clocks into ftraceAmit Nischal
Add clk_state event to record the state of all the clocks into ftrace. The clock event could be triggered by using the "trace_clocks" debugfs entry and it would dump the current state of all clocks in ftrace logs. Change-Id: I28b6574fe1d96472833a93e7b251dbba6c6eae49 Signed-off-by: Amit Nischal <anischal@codeaurora.org>
2017-05-01power_supply: Add REAL_TYPE power_supply_propertyFenglin Wu
Add REAL_TYPE power_supply property to record the real time charger type. Change-Id: I5fb2e3e3e782bcac0f8dd6071a830bcf370ebbd4 Signed-off-by: Fenglin Wu <fenglinw@codeaurora.org>
2017-05-02Merge remote-tracking branch 'remotes/quic/dev/msm-4.4-8996au' into msm-4.4Zhiqiang Tu
Conflicts: arch/arm/boot/dts/qcom/msm8996-auto-cdp.dtsi drivers/gpu/drm/msm/Makefile Change-Id: Ief80c28ff1422fd71a0c3d2041531e2ab078ee7a Signed-off-by: Zhiqiang Tu <ztu@codeaurora.org>
2017-05-01cfg80211: Add macros to indicate backport support for FILSVidyullatha Kanchanapally
This change adds two macros, one to indicate backport support for the new connect done event which takes connection response parameters as a structure instead of function arguments and the other macro is to indicate backport support for FILS shared key authentication offload to driver. Change-Id: I6fb562741bb2abacbe1c7c7ffbf4b2afb25e555b CRs-Fixed: 2028536 Signed-off-by: Vidyullatha Kanchanapally <vidyullatha@codeaurora.org>
2017-05-01cfg80211: Add support for FILS shared key authentication offloadVidyullatha Kanchanapally
Enhance nl80211 and cfg80211 connect request and response APIs to support FILS shared key authentication offload. The new nl80211 attributes can be used to provide additional information to the driver to establish a FILS connection. Also enhance the set/del PMKSA to allow support for adding and deleting PMKSA based on FILS cache identifier. Add a new feature flag that drivers can use to advertize support for FILS shared key authentication and association in station mode when using their own SME. Change-Id: I75d47301b767e691d6240fd6c20c28b9bfaaa571 Signed-off-by: Vidyullatha Kanchanapally <vkanchan@qti.qualcomm.com> Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com> Git-commit: a3caf7440dedd2399f90f27ff11ac390bf03e6c4 Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git CRs-Fixed: 2028536 [vidyullatha@codeaurora.org: backport to kernel 4.4 - This commit includes the changes from following commits in include/uapi/linux/nl80211.h to compile for msm-4.4 - 4a4b8169501b18c3450ac735a7e277b24886a651 : cfg80211: Accept multiple RSSI thresholds for CQM] Signed-off-by: Vidyullatha Kanchanapally <vidyullatha@codeaurora.org>
2017-05-01wireless: define cipher/AKM suites using a macroJohannes Berg
The spec writes cipher/AKM suites as something like 00-0F-AC:9, but the part after the colon isn't hex, it's decimal, so that we've already had a few mistakes (in other code, or unmerged patches) to e.g. write 0x000FAC10 instead of 0x000FAC0A. Use a macro to avoid that problem. Reviewed-by: Luca Coelho <luciano.coelho@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com> Git-commit: 228c8c6b1f4376788e9d5ab00d50b10228eb40d3 Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git CRs-Fixed: 2028536 Change-Id: I1507de1ee316182d429186ff33a932675013ba7d Signed-off-by: Vidyullatha Kanchanapally <vidyullatha@codeaurora.org>
2017-05-01cfg80211: Use a structure to pass connect response paramsVidyullatha Kanchanapally
Currently the connect event from driver takes all the connection response parameters as arguments. With support for new features these response parameters can grow. Use a structure to pass these parameters rather than passing them as function arguments. Signed-off-by: Vidyullatha Kanchanapally <vkanchan@qti.qualcomm.com> Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com> [add to documentation] Signed-off-by: Johannes Berg <johannes.berg@intel.com> Git-commit: 5349a0f7bfbdd7d81b8418c707dcd1439c714647 Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git CRs-Fixed: 2028536 Change-Id: I340a96d052647f79248ef8aa2e0af2b6ba979b2d Signed-off-by: Vidyullatha Kanchanapally <vidyullatha@codeaurora.org>
2017-04-30esoc: Add err_fatal signal status to clink_opsArun KS
Auto_boot esoc devices can boot and crash before esoc driver comes up. But there is no way for the user space code to know that it has crashed by looking at status line alone. Hence, create a new ioctl entry to export status of err_fatal line to user space. Change-Id: Ie7d6115c749d4c63f06aefca29ba457d38eccc7f Signed-off-by: Arun KS <arunks@codeaurora.org>
2017-04-30Merge 4.4.65 into android-4.4Greg Kroah-Hartman
Changes in 4.4.65: tipc: make sure IPv6 header fits in skb headroom tipc: make dist queue pernet tipc: re-enable compensation for socket receive buffer double counting tipc: correct error in node fsm tty: nozomi: avoid a harmless gcc warning hostap: avoid uninitialized variable use in hfa384x_get_rid gfs2: avoid uninitialized variable warning tipc: fix random link resets while adding a second bearer tipc: fix socket timer deadlock mnt: Add a per mount namespace limit on the number of mounts xc2028: avoid use after free netfilter: nfnetlink: correctly validate length of batch messages tipc: check minimum bearer MTU vfio/pci: Fix integer overflows, bitmask check staging/android/ion : fix a race condition in the ion driver ping: implement proper locking perf/core: Fix concurrent sys_perf_event_open() vs. 'move_group' race Linux 4.4.65 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2017-04-30mnt: Add a per mount namespace limit on the number of mountsEric W. Biederman
commit d29216842a85c7970c536108e093963f02714498 upstream. CAI Qian <caiqian@redhat.com> pointed out that the semantics of shared subtrees make it possible to create an exponentially increasing number of mounts in a mount namespace. mkdir /tmp/1 /tmp/2 mount --make-rshared / for i in $(seq 1 20) ; do mount --bind /tmp/1 /tmp/2 ; done Will create create 2^20 or 1048576 mounts, which is a practical problem as some people have managed to hit this by accident. As such CVE-2016-6213 was assigned. Ian Kent <raven@themaw.net> described the situation for autofs users as follows: > The number of mounts for direct mount maps is usually not very large because of > the way they are implemented, large direct mount maps can have performance > problems. There can be anywhere from a few (likely case a few hundred) to less > than 10000, plus mounts that have been triggered and not yet expired. > > Indirect mounts have one autofs mount at the root plus the number of mounts that > have been triggered and not yet expired. > > The number of autofs indirect map entries can range from a few to the common > case of several thousand and in rare cases up to between 30000 and 50000. I've > not heard of people with maps larger than 50000 entries. > > The larger the number of map entries the greater the possibility for a large > number of active mounts so it's not hard to expect cases of a 1000 or somewhat > more active mounts. So I am setting the default number of mounts allowed per mount namespace at 100,000. This is more than enough for any use case I know of, but small enough to quickly stop an exponential increase in mounts. Which should be perfect to catch misconfigurations and malfunctioning programs. For anyone who needs a higher limit this can be changed by writing to the new /proc/sys/fs/mount-max sysctl. Tested-by: CAI Qian <caiqian@redhat.com> Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com> [bwh: Backported to 4.4: adjust context] Signed-off-by: Ben Hutchings <ben.hutchings@codethink.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-04-28Merge "drm/msm: Add explicit sync operations"Linux Build Service Account
2017-04-28Merge "ASoC: qdsp6v2: Remove Eagle code"Linux Build Service Account
2017-04-28Merge "Merge branch 'android-4.4@b834e92' into branch 'msm-4.4'"Linux Build Service Account
2017-04-28Merge "Revert "arm64: Change cpu_resume() to enable mmu early ...""Linux Build Service Account
2017-04-28Merge "cfg80211: Fix documentation for connect result"Linux Build Service Account
2017-04-28Merge "cfg80211: Add KEK/nonces for FILS association frames"Linux Build Service Account
2017-04-27Merge "ANDROID: AVB error handler to invalidate vbmeta partition."Linux Build Service Account
2017-04-27Merge "msm: dsi: Turn off supplies in low power state"Linux Build Service Account
2017-04-27Merge "Merge branch 'android-4.4@c71ad0f' into branch 'msm-4.4'"Linux Build Service Account
2017-04-27msm: camera: ispif: extend interface with line widthPetar Sivenov
During ISPIF 3D merge configuration, line width is needed in order to properly determine stereo merge 3D threshold register value. This change adds line width to ISPIF extended configuration struct. Change-Id: Iaa8ca00b4a69559d42b58a42cb61a0aa8f7a355b Signed-off-by: Petar Sivenov <psiven@codeaurora.org>
2017-04-26ANDROID: Update init/do_mounts_dm.c to the latest ChromiumOS version.David Zeuthen
This is needed for AVB integration work. Bug: 31796270 Test: Manually tested (other arch). Change-Id: I32fd37c1578c6414e3e6ff277d16ad94df7886b8 Signed-off-by: David Zeuthen <zeuthen@google.com> Git-commit: 6a6a7657c231e947233c43ae0522bbd4edf0139e Git-repo: https://android.googlesource.com/kernel/common/ Signed-off-by: Runmin Wang <runminw@codeaurora.org>
2017-04-26drm/msm: Add explicit sync operationsJordan Crouse
Add sync operations to give the user more control over the behavior of cached buffers. Change-Id: Ic0dedbad67e19a6b30b2cc5f6b2c7bbe52c2b708 Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
2017-04-26Merge "ASoC: msm: qdsp6v2: Add support for speaker swap"Linux Build Service Account
2017-04-25Merge "msm: kgsl: Allow draw context to perform only replay on recovery"Linux Build Service Account
2017-04-25Merge "iommu: disable smmu stalls on faulty transactions"Linux Build Service Account
2017-04-25Merge "drm/msm: Enable per cmdstream profiling for the user"Linux Build Service Account
2017-04-25Merge "ASoC: msm: qdsp6v2: Add TrueHD HDMI compress pass-though"Linux Build Service Account
2017-04-25Merge branch 'android-4.4@b834e92' into branch 'msm-4.4'Blagovest Kolenichev
* refs/heads/tmp-b834e92 Revert "USB: gadget: u_ether: Fix data stall issue in RNDIS tethering mode" Linux 4.4.63 MIPS: fix Select HAVE_IRQ_EXIT_ON_IRQ_STACK patch. sctp: deny peeloff operation on asocs with threads sleeping on it net: ipv6: check route protocol when deleting routes tty/serial: atmel: RS485 half duplex w/DMA: enable RX after TX is done SUNRPC: fix refcounting problems with auth_gss messages. ibmveth: calculate gso_segs for large packets catc: Use heap buffer for memory size test catc: Combine failure cleanup code in catc_probe() rtl8150: Use heap buffers for all register access pegasus: Use heap buffers for all register access virtio-console: avoid DMA from stack dvb-usb-firmware: don't do DMA on stack dvb-usb: don't use stack for firmware load mm: Tighten x86 /dev/mem with zeroing reads rtc: tegra: Implement clock handling platform/x86: acer-wmi: setup accelerometer when machine has appropriate notify event ext4: fix inode checksum calculation problem if i_extra_size is small dvb-usb-v2: avoid use-after-free ath9k: fix NULL pointer dereference crypto: ahash - Fix EINPROGRESS notification callback powerpc: Disable HFSCR[TM] if TM is not supported zram: do not use copy_page with non-page aligned address kvm: fix page struct leak in handle_vmon Revert "MIPS: Lantiq: Fix cascaded IRQ setup" char: lack of bool string made CONFIG_DEVPORT always on char: Drop bogus dependency of DEVPORT on !M68K ftrace: Fix removing of second function probe irqchip/irq-imx-gpcv2: Fix spinlock initialization libnvdimm: fix reconfig_mutex, mmap_sem, and jbd2_handle lockdep splat xen, fbfront: fix connecting to backend scsi: sd: Fix capacity calculation with 32-bit sector_t scsi: sd: Consider max_xfer_blocks if opt_xfer_blocks is unusable scsi: sr: Sanity check returned mode data iscsi-target: Drop work-around for legacy GlobalSAN initiator iscsi-target: Fix TMR reference leak during session shutdown acpi, nfit, libnvdimm: fix interleave set cookie calculation (64-bit comparison) x86/vdso: Plug race between mapping and ELF header setup x86/vdso: Ensure vdso32_enabled gets set to valid values only perf/x86: Avoid exposing wrong/stale data in intel_pmu_lbr_read_32() Input: xpad - add support for Razer Wildcat gamepad CIFS: store results of cifs_reopen_file to avoid infinite wait drm/nouveau/mmu/nv4a: use nv04 mmu rather than the nv44 one drm/nouveau/mpeg: mthd returns true on success now thp: fix MADV_DONTNEED vs clear soft dirty race cgroup, kthread: close race window where new kthreads can be migrated to non-root cgroups ANDROID: uid_sys_stats: reduce update_io_stats overhead UPSTREAM: char: lack of bool string made CONFIG_DEVPORT always on UPSTREAM: char: Drop bogus dependency of DEVPORT on !M68K Revert "Android: sdcardfs: Don't do d_add for lower fs" ANDROID: usb: gadget: fix MTP enumeration issue under super speed mode Android: sdcardfs: Don't complain in fixup_lower_ownership Android: sdcardfs: Don't do d_add for lower fs ANDROID: sdcardfs: ->iget fixes Android: sdcardfs: Change cache GID value BACKPORT: [UPSTREAM] ext2: convert to mbcache2 BACKPORT [UPSTREAM] ext4: convert to mbcache2 BACKPORT: [UPSTREAM] mbcache2: reimplement mbcache Linux 4.4.62 ibmveth: set correct gso_size and gso_type net/mlx4_core: Fix when to save some qp context flags for dynamic VST to VGT transitions net/mlx4_core: Fix racy CQ (Completion Queue) free net/mlx4_en: Fix bad WQE issue usb: hub: Wait for connection to be reestablished after port reset blk-mq: Avoid memory reclaim when remapping queues net/packet: fix overflow in check for priv area size crypto: caam - fix RNG deinstantiation error checking MIPS: IRQ Stack: Fix erroneous jal to plat_irq_dispatch MIPS: Select HAVE_IRQ_EXIT_ON_IRQ_STACK MIPS: Switch to the irq_stack in interrupts MIPS: Only change $28 to thread_info if coming from user mode MIPS: Stack unwinding while on IRQ stack MIPS: Introduce irq_stack mtd: bcm47xxpart: fix parsing first block after aligned TRX usb: dwc3: gadget: delay unmap of bounced requests drm/i915: Stop using RP_DOWN_EI on Baytrail drm/i915: Avoid tweaking evaluation thresholds on Baytrail v3 UPSTREAM: net: socket: Make unnecessarily global sockfs_setattr() static UPSTREAM: net: ipv4: Don't crash if passing a null sk to ip_do_redirect. UPSTREAM: net/packet: fix overflow in check for priv area size Linux 4.4.61 mm/mempolicy.c: fix error handling in set_mempolicy and mbind. MIPS: Flush wrong invalid FTLB entry for huge page MIPS: Lantiq: fix missing xbar kernel panic MIPS: End spinlocks with .insn MIPS: ralink: Fix typos in rt3883 pinctrl MIPS: Force o32 fp64 support on 32bit MIPS64r6 kernels s390/uaccess: get_user() should zero on failure (again) s390/decompressor: fix initrd corruption caused by bss clear nios2: reserve boot memory for device tree powerpc: Don't try to fix up misaligned load-with-reservation instructions powerpc/mm: Add missing global TLB invalidate if cxl is active metag/usercopy: Add missing fixups metag/usercopy: Fix src fixup in from user rapf loops metag/usercopy: Set flags before ADDZ metag/usercopy: Zero rest of buffer from copy_from_user metag/usercopy: Add early abort to copy_to_user metag/usercopy: Fix alignment error checking metag/usercopy: Drop unused macros ring-buffer: Fix return value check in test_ringbuffer() ptrace: fix PTRACE_LISTEN race corrupting task->state Reset TreeId to zero on SMB2 TREE_CONNECT iio: bmg160: reset chip when probing arm/arm64: KVM: Take mmap_sem in kvm_arch_prepare_memory_region arm/arm64: KVM: Take mmap_sem in stage2_unmap_vm staging: android: ashmem: lseek failed due to no FMODE_LSEEK. sysfs: be careful of error returns from ops->show() drm/vmwgfx: fix integer overflow in vmw_surface_define_ioctl() drm/vmwgfx: Remove getparam error message drm/ttm, drm/vmwgfx: Relax permission checking when opening surfaces drm/vmwgfx: avoid calling vzalloc with a 0 size in vmw_get_cap_3d_ioctl() drm/vmwgfx: NULL pointer dereference in vmw_surface_define_ioctl() drm/vmwgfx: Type-check lookups of fence objects Revert "Revert "Revert "CHROMIUM: android: binder: Fix potential scheduling-while-atomic""" ANDROID: sdcardfs: Directly pass lower file for mmap UPSTREAM: checkpatch: special audit for revert commit line UPSTREAM: PM / sleep: make PM notifiers called symmetrically Revert "Revert "CHROMIUM: android: binder: Fix potential scheduling-while-atomic"" Linux 4.4.60 padata: avoid race in reordering blk: Ensure users for current->bio_list can see the full list. blk: improve order of bio handling in generic_make_request() power: reset: at91-poweroff: timely shutdown LPDDR memories KVM: kvm_io_bus_unregister_dev() should never fail rtc: s35390a: improve irq handling rtc: s35390a: implement reset routine as suggested by the reference rtc: s35390a: make sure all members in the output are set rtc: s35390a: fix reading out alarm MIPS: Lantiq: Fix cascaded IRQ setup mm, hugetlb: use pte_present() instead of pmd_present() in follow_huge_pmd() drm/radeon: Override fpfn for all VRAM placements in radeon_evict_flags KVM: x86: clear bus pointer when destroyed USB: fix linked-list corruption in rh_call_control() tty/serial: atmel: fix TX path in atmel_console_write() tty/serial: atmel: fix race condition (TX+DMA) ACPI: Do not create a platform_device for IOAPIC/IOxAPIC ACPI: Fix incompatibility with mcount-based function graph tracing ASoC: atmel-classd: fix audio clock rate ALSA: hda - fix a problem for lineout on a Dell AIO machine ALSA: seq: Fix race during FIFO resize scsi: libsas: fix ata xfer length scsi: sg: check length passed to SG_NEXT_CMD_LEN scsi: mpt3sas: fix hang on ata passthrough commands xen/setup: Don't relocate p2m over existing one libceph: force GFP_NOIO for socket allocations Linux 4.4.59 sched/rt: Add a missing rescheduling point fscrypt: remove broken support for detecting keyring key revocation metag/ptrace: Reject partial NT_METAG_RPIPE writes metag/ptrace: Provide default TXSTATUS for short NT_PRSTATUS metag/ptrace: Preserve previous registers for short regset write sparc/ptrace: Preserve previous registers for short regset write mips/ptrace: Preserve previous registers for short regset write h8300/ptrace: Fix incorrect register transfer count c6x/ptrace: Remove useless PTRACE_SETREGSET implementation pinctrl: qcom: Don't clear status bit on irq_unmask virtio_balloon: init 1st buffer in stats vq xfrm_user: validate XFRM_MSG_NEWAE incoming ESN size harder xfrm_user: validate XFRM_MSG_NEWAE XFRMA_REPLAY_ESN_VAL replay_window xfrm: policy: init locks early Conflicts: drivers/scsi/sd.c drivers/usb/gadget/function/f_mtp.c drivers/usb/gadget/function/u_ether.c Change-Id: I80501cf02d04204f8c0f3a7f5a036eaa4d54546e Signed-off-by: Blagovest Kolenichev <bkolenichev@codeaurora.org>
2017-04-25ANDROID: Update init/do_mounts_dm.c to the latest ChromiumOS version.David Zeuthen
This is needed for AVB integration work. Bug: 31796270 Test: Manually tested (other arch). Change-Id: I32fd37c1578c6414e3e6ff277d16ad94df7886b8 Signed-off-by: David Zeuthen <zeuthen@google.com>
2017-04-25iommu: disable smmu stalls on faulty transactionsCharan Teja Reddy
Disable the SMMU stalls on faulty transactions by terminating it using the CB.SCTLR register. Faulty transaction on a CB causes the back pressure on the QSMMU transaction pipe which inturn affect the other masters using the same SMMU. Pass the DOMAIN_ATTR_CB_STALL_DISABLE flag to iommu_domain_set_attr api in order to use this feature. Change-Id: Ib8fa35854ff24e0295d330c5fb79375f58c3e841 Signed-off-by: Charan Teja Reddy <charante@codeaurora.org>