1. 25 Feb, 2017 2 commits
    • Thomas Gleixner's avatar
      mac80211_hwsim: Replace bogus hrtimer clockid · 915f3e3f
      Thomas Gleixner authored
      mac80211_hwsim initializes a hrtimer with clockid CLOCK_MONOTONIC_RAW.
      That's not supported.
      
      Use CLOCK_MONOTNIC instead.
      Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      915f3e3f
    • Linus Torvalds's avatar
      Merge tag 'openrisc-for-linus' of git://github.com/openrisc/linux · 9e314890
      Linus Torvalds authored
      Pull OpenRISC updates from Stafford Horne:
       "Highlights include:
      
         - optimized memset and memcpy routines, ~20% boot time saving
      
         - support for cpu idling
      
         - adding support for l.swa and l.lwa atomic operations (in spec from
           2014)
      
         - use atomics to implement: bitops, cmpxchg, futex
      
         - the atomics are in preparation for SMP support"
      
      * tag 'openrisc-for-linus' of git://github.com/openrisc/linux: (25 commits)
        openrisc: head: Init r0 to 0 on start
        openrisc: Export ioremap symbols used by modules
        arch/openrisc/lib/memcpy.c: use correct OR1200 option
        openrisc: head: Remove unused strings
        openrisc: head: Move init strings to rodata section
        openrisc: entry: Fix delay slot detection
        openrisc: entry: Whitespace and comment cleanups
        scripts/checkstack.pl: Add openrisc support
        MAINTAINERS: Add the openrisc official repository
        openrisc: Add .gitignore
        openrisc: Add optimized memcpy routine
        openrisc: Add optimized memset
        openrisc: Initial support for the idle state
        openrisc: Fix the bitmask for the unit present register
        openrisc: remove unnecessary stddef.h include
        openrisc: add futex_atomic_* implementations
        openrisc: add optimized atomic operations
        openrisc: add cmpxchg and xchg implementations
        openrisc: add atomic bitops
        openrisc: add l.lwa/l.swa emulation
        ...
      9e314890
  2. 24 Feb, 2017 31 commits
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc · f8e6859e
      Linus Torvalds authored
      Pull sparc updates from David Miller:
      
       1) Support multiple huge page sizes, from Nitin Gupta.
      
       2) Improve boot time on large memory configurations, from Pavel
          Tatashin.
      
       3) Make BRK handling more consistent and documented, from Vijay Kumar.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
        sparc64: Fix build error in flush_tsb_user_page
        sparc64: memblock resizes are not handled properly
        sparc64: use latency groups to improve add_node_ranges speed
        sparc64: Add 64K page size support
        sparc64: Multi-page size support
        Documentation/sparc: Steps for sending break on sunhv console
        sparc64: Send break twice from console to return to boot prom
        sparc64: Migrate hvcons irq to panicked cpu
        sparc64: Set cpu state to offline when stopped
        sunvdc: Add support for setting physical sector size
        sparc64: fix for user probes in high memory
        sparc: topology_64.h: Fix condition for including cpudata.h
        sparc32: mm: srmmu: add __ro_after_init to sparc32_cachetlb_ops structures
      f8e6859e
    • Linus Torvalds's avatar
      Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/shli/md · a682e003
      Linus Torvalds authored
      Pull md updates from Shaohua Li:
       "Mainly fixes bugs and improves performance:
      
         - Improve scalability for raid1 from Coly
      
         - Improve raid5-cache read performance, disk efficiency and IO
           pattern from Song and me
      
         - Fix a race condition of disk hotplug for linear from Coly
      
         - A few cleanup patches from Ming and Byungchul
      
         - Fix a memory leak from Neil
      
         - Fix WRITE SAME IO failure from me
      
         - Add doc for raid5-cache from me"
      
      * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/shli/md: (23 commits)
        md/raid1: fix write behind issues introduced by bio_clone_bioset_partial
        md/raid1: handle flush request correctly
        md/linear: shutup lockdep warnning
        md/raid1: fix a use-after-free bug
        RAID1: avoid unnecessary spin locks in I/O barrier code
        RAID1: a new I/O barrier implementation to remove resync window
        md/raid5: Don't reinvent the wheel but use existing llist API
        md: fast clone bio in bio_clone_mddev()
        md: remove unnecessary check on mddev
        md/raid1: use bio_clone_bioset_partial() in case of write behind
        md: fail if mddev->bio_set can't be created
        block: introduce bio_clone_bioset_partial()
        md: disable WRITE SAME if it fails in underlayer disks
        md/raid5-cache: exclude reclaiming stripes in reclaim check
        md/raid5-cache: stripe reclaim only counts valid stripes
        MD: add doc for raid5-cache
        Documentation: move MD related doc into a separate dir
        md: ensure md devices are freed before module is unloaded.
        md/r5cache: improve journal device efficiency
        md/r5cache: enable chunk_aligned_read with write back cache
        ...
      a682e003
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.dk/linux-block · 1802979a
      Linus Torvalds authored
      Pull block updates and fixes from Jens Axboe:
      
       - NVMe updates and fixes that missed the first pull request. This
         includes bug fixes, and support for autonomous power management.
      
       - Fix from Christoph for missing clear of the request payload, causing
         a problem with (at least) the storvsc driver.
      
       - Further fixes for the queue/bdi life time issues from Jan.
      
       - The Kconfig mq scheduler update from me.
      
       - Fixing a use-after-free in dm-rq, spotted by Bart, introduced in this
         merge window.
      
       - Three fixes for nbd from Josef.
      
       - Bug fix from Omar, fixing a bug in sas transport code that oopses
         when bsg ioctls were used. From Omar.
      
       - Improvements to the queue restart and tag wait from from Omar.
      
       - Set of fixes for the sed/opal code from Scott.
      
       - Three trivial patches to cciss from Tobin
      
      * 'for-linus' of git://git.kernel.dk/linux-block: (41 commits)
        dm-rq: don't dereference request payload after ending request
        blk-mq-sched: separate mark hctx and queue restart operations
        blk-mq: use sbq wait queues instead of restart for driver tags
        block/sed-opal: Propagate original error message to userland.
        nvme/pci: re-check security protocol support after reset
        block/sed-opal: Introduce free_opal_dev to free the structure and clean up state
        nvme: detect NVMe controller in recent MacBooks
        nvme-rdma: add support for host_traddr
        nvmet-rdma: Fix error handling
        nvmet-rdma: use nvme cm status helper
        nvme-rdma: move nvme cm status helper to .h file
        nvme-fc: don't bother to validate ioccsz and iorcsz
        nvme/pci: No special case for queue busy on IO
        nvme/core: Fix race kicking freed request_queue
        nvme/pci: Disable on removal when disconnected
        nvme: Enable autonomous power state transitions
        nvme: Add a quirk mechanism that uses identify_ctrl
        nvme: make nvmf_register_transport require a create_ctrl callback
        nvme: Use CNS as 8-bit field and avoid endianness conversion
        nvme: add semicolon in nvme_command setting
        ...
      1802979a
    • Jens Axboe's avatar
      dm-rq: don't dereference request payload after ending request · 61febef4
      Jens Axboe authored
      Bart reported a case where dm would crash with use-after-free
      poison. This is due to dm_softirq_done() accessing memory
      associated with a request after calling end_request on it.
      This is most visible on !blk-mq, since we free the memory
      immediately for that case.
      Reported-by: default avatarBart Van Assche <bart.vanassche@sandisk.com>
      Suggested-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      Fixes: eb8db831 ("dm: always defer request allocation to the owner of the request_queue")
      Signed-off-by: default avatarJens Axboe <axboe@fb.com>
      61febef4
    • Stafford Horne's avatar
      openrisc: head: Init r0 to 0 on start · a4d44266
      Stafford Horne authored
      Originally openrisc spec 0 specified that r0 would be wired to ground.
      This is no longer the case.  r0 is not guaranteed to be 0 at init, so we
      need to initialize it to 0 before using it.
      
      Also, if we are clearing r0 we cant use r0 to clear itself. Change the
      the CLEAR_GPR macro to use movhi for clearing.
      Reported-by: default avatarJakob Viketoft <jakob.viketoft@aacmicrotec.com>
      Signed-off-by: default avatarStafford Horne <shorne@gmail.com>
      a4d44266
    • Stafford Horne's avatar
      openrisc: Export ioremap symbols used by modules · a0eba4f7
      Stafford Horne authored
      Noticed this when building with allyesconfig.  Got build failures due
      to iounmap and __ioremap symbols missing.  This patch exports them so
      modules can use them.  This is inline with other architectures.
      Signed-off-by: default avatarStafford Horne <shorne@gmail.com>
      a0eba4f7
    • Valentin Rothberg's avatar
      arch/openrisc/lib/memcpy.c: use correct OR1200 option · e34f671d
      Valentin Rothberg authored
      The Kconfig option for OR12000 is OR1K_1200.
      Signed-off-by: default avatarValentin Rothberg <valentinrothberg@gmail.com>
      Signed-off-by: default avatarStafford Horne <shorne@gmail.com>
      e34f671d
    • Stafford Horne's avatar
      openrisc: head: Remove unused strings · 0ccffdf5
      Stafford Horne authored
      These string definitions are no longer used removed them.  Noticed this
      while working on a CONFIG_DEBUG_INFO build issue.
      Signed-off-by: default avatarStafford Horne <shorne@gmail.com>
      0ccffdf5
    • Stafford Horne's avatar
      openrisc: head: Move init strings to rodata section · da99f00e
      Stafford Horne authored
      The strings used during the head/init phase of openrisc bootup were
      stored in the executable section of the binary.
      
      This causes compilation to fail when using CONFIG_DEBUG_INFO with
      error:
       Error: unaligned opcodes detected in executable segment
      Signed-off-by: default avatarStafford Horne <shorne@gmail.com>
      da99f00e
    • Stafford Horne's avatar
      openrisc: entry: Fix delay slot detection · e6d20c55
      Stafford Horne authored
      Use execption SR stored in pt_regs for detection, the current SR is not
      correct as the handler is running after return from exception.
      
      Also, The code that checks for a delay slot uses a flag bitmask and then
      wants to check if the result is not zero.  The test it implemented was
      wrong.
      
      Correct it by changing the test to check result against non zero.
      Signed-off-by: default avatarStafford Horne <shorne@gmail.com>
      e6d20c55
    • Stafford Horne's avatar
      openrisc: entry: Whitespace and comment cleanups · 2ead7aba
      Stafford Horne authored
      Cleanups to whitespace and add some comments. Reading through the delay
      slot logic I noticed some things:
       - Delay slot instructions were not indented
       - Some comments are not lined up
       - Use tabs and spaces consistent with other code
      
      No functional change
      Signed-off-by: default avatarStafford Horne <shorne@gmail.com>
      2ead7aba
    • Stafford Horne's avatar
      scripts/checkstack.pl: Add openrisc support · f72deab3
      Stafford Horne authored
      Openrisc stack pointer is managed by decrementing r1. Add regexes to
      recognize this.
      Signed-off-by: default avatarStafford Horne <shorne@gmail.com>
      f72deab3
    • Stafford Horne's avatar
      MAINTAINERS: Add the openrisc official repository · 9dfc96d7
      Stafford Horne authored
      The openrisc official repository and patch work happens currently on
      github. Add the repo for reference.
      Signed-off-by: default avatarStafford Horne <shorne@gmail.com>
      9dfc96d7
    • Stafford Horne's avatar
      openrisc: Add .gitignore · f5209283
      Stafford Horne authored
      This helps to suppress the vmlinux.lds file.
      Signed-off-by: default avatarStafford Horne <shorne@gmail.com>
      f5209283
    • Stafford Horne's avatar
      openrisc: Add optimized memcpy routine · f5d45dc9
      Stafford Horne authored
      The generic memcpy routine provided in kernel does only byte copies.
      Using word copies we can lower boot time and cycles spend in memcpy
      quite significantly.
      
      Booting on my de0 nano I see boot times go from 7.2 to 5.6 seconds.
      The avg cycles in memcpy during boot go from 6467 to 1887.
      
      I tested several algorithms (see code in previous patch mails)
      
      The implementations I tested and avg cycles:
        - Word Copies + Loop Unrolls + Non Aligned    1882
        - Word Copies + Loop Unrolls                  1887
        - Word Copies                                 2441
        - Byte Copies + Loop Unrolls                  6467
        - Byte Copies                                 7600
      
      In the end I ended up going with Word Copies + Loop Unrolls as it
      provides best tradeoff between simplicity and boot speedups.
      Signed-off-by: default avatarStafford Horne <shorne@gmail.com>
      f5d45dc9
    • Olof Kindgren's avatar
      openrisc: Add optimized memset · d857a1e2
      Olof Kindgren authored
      This adds a hand-optimized assembler version of memset and sets
      __HAVE_ARCH_MEMSET to use this version instead of the generic C
      routine
      Signed-off-by: default avatarOlof Kindgren <olof.kindgren@gmail.com>
      Signed-off-by: default avatarStafford Horne <shorne@gmail.com>
      d857a1e2
    • Sebastian Macke's avatar
      openrisc: Initial support for the idle state · e29d11c6
      Sebastian Macke authored
      This patch adds basic support for the idle state of the cpu.
      The patch overrides the regular idle function, enables the interupts,
      checks for the power management unit and enables the cpu doze mode
      if available.
      Signed-off-by: default avatarSebastian Macke <sebastian@macke.de>
      [shorne@gmail.com: Fixed checkpatch, blankline after declarations]
      Signed-off-by: default avatarStafford Horne <shorne@gmail.com>
      e29d11c6
    • Sebastian Macke's avatar
      openrisc: Fix the bitmask for the unit present register · 79f8a4d0
      Sebastian Macke authored
      The bits were swapped, as per spec and processor implementation the
      power management present bit is 9 and PIC bit is 8. This patch brings
      the definitions into spec.
      Signed-off-by: default avatarSebastian Macke <sebastian@macke.de>
      [shorne@gmail.com: Added commit body]
      Signed-off-by: default avatarStafford Horne <shorne@gmail.com>
      79f8a4d0
    • Stefan Kristiansson's avatar
      openrisc: remove unnecessary stddef.h include · 89c94fdb
      Stefan Kristiansson authored
      This causes the build to fail when building with the or1k-musl-linux-
      toolchain and it is not needed.
      Signed-off-by: default avatarStafford Horne <shorne@gmail.com>
      89c94fdb
    • Stefan Kristiansson's avatar
      openrisc: add futex_atomic_* implementations · 4ac46db1
      Stefan Kristiansson authored
      Support for the futex_atomic_* operations by using the
      load-link/store-conditional l.lwa/l.swa instructions.
      Most openrisc cores provide these instructions now if not available,
      emulation is provided.
      Acked-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Signed-off-by: default avatarStefan Kristiansson <stefan.kristiansson@saunalahti.fi>
      [shorne@gmail.com: remove OPENRISC_HAVE_INST_LWA_SWA config suggesed by
      Alan Cox https://lkml.org/lkml/2014/7/23/666]
      Signed-off-by: default avatarStafford Horne <shorne@gmail.com>
      4ac46db1
    • Stefan Kristiansson's avatar
      openrisc: add optimized atomic operations · bc19598f
      Stefan Kristiansson authored
      Using the l.lwa and l.swa atomic instruction pair.
      Most openrisc processor cores provide these instructions now. If the
      instructions are not available emulation is provided.
      Acked-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Signed-off-by: default avatarStefan Kristiansson <stefan.kristiansson@saunalahti.fi>
      [shorne@gmail.com: remove OPENRISC_HAVE_INST_LWA_SWA config suggesed by
      Alan Cox https://lkml.org/lkml/2014/7/23/666]
      [shorne@gmail.com: expand to implement all ops suggested by Peter
      Zijlstra https://lkml.org/lkml/2017/2/20/317]
      Signed-off-by: default avatarStafford Horne <shorne@gmail.com>
      bc19598f
    • Stefan Kristiansson's avatar
      openrisc: add cmpxchg and xchg implementations · 11595172
      Stefan Kristiansson authored
      Optimized version that make use of the l.lwa and l.swa atomic instruction
      pair.
      Most openrisc cores provide these instructions now, if not available
      emulation is provided.
      Acked-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Signed-off-by: default avatarStefan Kristiansson <stefan.kristiansson@saunalahti.fi>
      [shorne@gmail.com: remove OPENRISC_HAVE_INST_LWA_SWA config suggesed by
      Alan Cox https://lkml.org/lkml/2014/7/23/666]
      [shorne@gmail.com: fixed unused calculated value compiler warning in
      define cmpxchg]
      Signed-off-by: default avatarStafford Horne <shorne@gmail.com>
      11595172
    • Stefan Kristiansson's avatar
      openrisc: add atomic bitops · 0e9f9fd2
      Stefan Kristiansson authored
      This utilize the load-link/store-conditional l.lwa and l.swa
      instructions to implement the atomic bitops.
      When those instructions are not available emulation is provided.
      Acked-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Signed-off-by: default avatarStefan Kristiansson <stefan.kristiansson@saunalahti.fi>
      [shorne@gmail.com: remove OPENRISC_HAVE_INST_LWA_SWA config suggesed by
      Alan Cox https://lkml.org/lkml/2014/7/23/666, implement
      test_and_change_bit]
      Signed-off-by: default avatarStafford Horne <shorne@gmail.com>
      0e9f9fd2
    • Nitin Gupta's avatar
      sparc64: Fix build error in flush_tsb_user_page · ac65e282
      Nitin Gupta authored
      Patch "sparc64: Add 64K page size support"
      unconditionally used __flush_huge_tsb_one_entry()
      which is available only when hugetlb support is
      enabled.
      
      Another issue was incorrect TSB flushing for 64K
      pages in flush_tsb_user().
      Signed-off-by: default avatarNitin Gupta <nitin.m.gupta@oracle.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      ac65e282
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace · f1ef09fd
      Linus Torvalds authored
      Pull namespace updates from Eric Biederman:
       "There is a lot here. A lot of these changes result in subtle user
        visible differences in kernel behavior. I don't expect anything will
        care but I will revert/fix things immediately if any regressions show
        up.
      
        From Seth Forshee there is a continuation of the work to make the vfs
        ready for unpriviled mounts. We had thought the previous changes
        prevented the creation of files outside of s_user_ns of a filesystem,
        but it turns we missed the O_CREAT path. Ooops.
      
        Pavel Tikhomirov and Oleg Nesterov worked together to fix a long
        standing bug in the implemenation of PR_SET_CHILD_SUBREAPER where only
        children that are forked after the prctl are considered and not
        children forked before the prctl. The only known user of this prctl
        systemd forks all children after the prctl. So no userspace
        regressions will occur. Holding earlier forked children to the same
        rules as later forked children creates a semantic that is sane enough
        to allow checkpoing of processes that use this feature.
      
        There is a long delayed change by Nikolay Borisov to limit inotify
        instances inside a user namespace.
      
        Michael Kerrisk extends the API for files used to maniuplate
        namespaces with two new trivial ioctls to allow discovery of the
        hierachy and properties of namespaces.
      
        Konstantin Khlebnikov with the help of Al Viro adds code that when a
        network namespace exits purges it's sysctl entries from the dcache. As
        in some circumstances this could use a lot of memory.
      
        Vivek Goyal fixed a bug with stacked filesystems where the permissions
        on the wrong inode were being checked.
      
        I continue previous work on ptracing across exec. Allowing a file to
        be setuid across exec while being ptraced if the tracer has enough
        credentials in the user namespace, and if the process has CAP_SETUID
        in it's own namespace. Proc files for setuid or otherwise undumpable
        executables are now owned by the root in the user namespace of their
        mm. Allowing debugging of setuid applications in containers to work
        better.
      
        A bug I introduced with permission checking and automount is now
        fixed. The big change is to mark the mounts that the kernel initiates
        as a result of an automount. This allows the permission checks in sget
        to be safely suppressed for this kind of mount. As the permission
        check happened when the original filesystem was mounted.
      
        Finally a special case in the mount namespace is removed preventing
        unbounded chains in the mount hash table, and making the semantics
        simpler which benefits CRIU.
      
        The vfs fix along with related work in ima and evm I believe makes us
        ready to finish developing and merge fully unprivileged mounts of the
        fuse filesystem. The cleanups of the mount namespace makes discussing
        how to fix the worst case complexity of umount. The stacked filesystem
        fixes pave the way for adding multiple mappings for the filesystem
        uids so that efficient and safer containers can be implemented"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace:
        proc/sysctl: Don't grab i_lock under sysctl_lock.
        vfs: Use upper filesystem inode in bprm_fill_uid()
        proc/sysctl: prune stale dentries during unregistering
        mnt: Tuck mounts under others instead of creating shadow/side mounts.
        prctl: propagate has_child_subreaper flag to every descendant
        introduce the walk_process_tree() helper
        nsfs: Add an ioctl() to return owner UID of a userns
        fs: Better permission checking for submounts
        exit: fix the setns() && PR_SET_CHILD_SUBREAPER interaction
        vfs: open() with O_CREAT should not create inodes with unknown ids
        nsfs: Add an ioctl() to return the namespace type
        proc: Better ownership of files for non-dumpable tasks in user namespaces
        exec: Remove LSM_UNSAFE_PTRACE_CAP
        exec: Test the ptracer's saved cred to see if the tracee can gain caps
        exec: Don't reset euid and egid when the tracee has CAP_SETUID
        inotify: Convert to using per-namespace limits
      f1ef09fd
    • Linus Torvalds's avatar
      Merge tag 'drm-for-v4.11-less-shouty' of git://people.freedesktop.org/~airlied/linux · ef96152e
      Linus Torvalds authored
      Pull drm updates from Dave Airlie:
       "This is the main drm pull request for v4.11.
      
        Nothing too major, the tinydrm and mmu-less support should make
        writing smaller drivers easier for some of the simpler platforms, and
        there are a bunch of documentation updates.
      
        Intel grew displayport MST audio support which is hopefully useful to
        people, and FBC is on by default for GEN9+ (so people know where to
        look for regressions). AMDGPU has a lot of fixes that would like new
        firmware files installed for some GPUs.
      
        Other than that it's pretty scattered all over.
      
        I may have a follow up pull request as I know BenH has a bunch of AST
        rework and fixes and I'd like to get those in once they've been tested
        by AST, and I've got at least one pull request I'm just trying to get
        the author to fix up.
      
        Core:
         - drm_mm reworked
         - Connector list locking and iterators
         - Documentation updates
         - Format handling rework
         - MMU-less support for fbdev helpers
         - drm_crtc_from_index helper
         - Core CRC API
         - Remove drm_framebuffer_unregister_private
         - Debugfs cleanup
         - EDID/Infoframe fixes
         - Release callback
         - Tinydrm support (smaller drivers for simple hw)
      
        panel:
         - Add support for some new simple panels
      
        i915:
         - FBC by default for gen9+
         - Shared dpll cleanups and docs
         - GEN8 powerdomain cleanup
         - DMC support on GLK
         - DP MST audio support
         - HuC loading support
         - GVT init ordering fixes
         - GVT IOMMU workaround fix
      
        amdgpu/radeon:
         - Power/clockgating improvements
         - Preliminary SR-IOV support
         - TTM buffer priority and eviction fixes
         - SI DPM quirks removed due to firmware fixes
         - Powerplay improvements
         - VCE/UVD powergating fixes
         - Cleanup SI GFX code to match CI/VI
         - Support for > 2 displays on 3/5 crtc asics
         - SI headless fixes
      
        nouveau:
         - Rework securre boot code in prep for GP10x secure boot
         - Channel recovery improvements
         - Initial power budget code
         - MMU rework preperation
      
        vmwgfx:
         - Bunch of fixes and cleanups
      
        exynos:
         - Runtime PM support for MIC driver
         - Cleanups to use atomic helpers
         - UHD Support for TM2/TM2E boards
         - Trigger mode fix for Rinato board
      
        etnaviv:
         - Shader performance fix
         - Command stream validator fixes
         - Command buffer suballocator
      
        rockchip:
         - CDN DisplayPort support
         - IOMMU support for arm64 platform
      
        imx-drm:
         - Fix i.MX5 TV encoder probing
         - Remove lower fb size limits
      
        msm:
         - Support for HW cursor on MDP5 devices
         - DSI encoder cleanup
         - GPU DT bindings cleanup
      
        sti:
         - stih410 cleanups
         - Create fbdev at binding
         - HQVDP fixes
         - Remove stih416 chip functionality
         - DVI/HDMI mode selection fixes
         - FPS statistic reporting
      
        omapdrm:
         - IRQ code cleanup
      
        dwi-hdmi bridge:
         - Cleanups and fixes
      
        adv-bridge:
         - Updates for nexus
      
        sii8520 bridge:
         - Add interlace mode support
         - Rework HDMI and lots of fixes
      
        qxl:
         - probing/teardown cleanups
      
        ZTE drm:
         - HDMI audio via SPDIF interface
         - Video Layer overlay plane support
         - Add TV encoder output device
      
        atmel-hlcdc:
         - Rework fbdev creation logic
      
        tegra:
         - OF node fix
      
        fsl-dcu:
         - Minor fixes
      
        mali-dp:
         - Assorted fixes
      
        sunxi:
         - Minor fix"
      
      [ This was the "fixed" pull, that still had build warnings due to people
        not even having build tested the result. I'm not a happy camper
      
        I've fixed the things I noticed up in this merge.      - Linus ]
      
      * tag 'drm-for-v4.11-less-shouty' of git://people.freedesktop.org/~airlied/linux: (1177 commits)
        lib/Kconfig: make PRIME_NUMBERS not user selectable
        drm/tinydrm: helpers: Properly fix backlight dependency
        drm/tinydrm: mipi-dbi: Fix field width specifier warning
        drm/tinydrm: mipi-dbi: Silence: ‘cmd’ may be used uninitialized
        drm/sti: fix build warnings in sti_drv.c and sti_vtg.c files
        drm/amd/powerplay: fix PSI feature on Polars12
        drm/amdgpu: refuse to reserve io mem for split VRAM buffers
        drm/ttm: fix use-after-free races in vm fault handling
        drm/tinydrm: Add support for Multi-Inno MI0283QT display
        dt-bindings: Add Multi-Inno MI0283QT binding
        dt-bindings: display/panel: Add common rotation property
        of: Add vendor prefix for Multi-Inno
        drm/tinydrm: Add MIPI DBI support
        drm/tinydrm: Add helper functions
        drm: Add DRM support for tiny LCD displays
        drm/amd/amdgpu: post card if there is real hw resetting performed
        drm/nouveau/tmr: provide backtrace when a timeout is hit
        drm/nouveau/pci/g92: Fix rearm
        drm/nouveau/drm/therm/fan: add a fallback if no fan control is specified in the vbios
        drm/nouveau/hwmon: expose power_max and power_crit
        ..
      ef96152e
    • Dave Airlie's avatar
      lib/Kconfig: make PRIME_NUMBERS not user selectable. · 64a57719
      Dave Airlie authored
      Linus doesn't like it user selectable, so kill it until
      someone needs it for something else.
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      64a57719
    • Noralf Trønnes's avatar
      drm/tinydrm: helpers: Properly fix backlight dependency · 7fef80a4
      Noralf Trønnes authored
      BACKLIGHT_CLASS_DEVICE was selected in the last version of the
      tinydrm patchset to fix the backlight dependency, but the
      ifdef CONFIG_BACKLIGHT_CLASS_DEVICE was forgotten. Fix that.
      Signed-off-by: default avatarNoralf Trønnes <noralf@tronnes.org>
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      7fef80a4
    • Noralf Trønnes's avatar
      drm/tinydrm: mipi-dbi: Fix field width specifier warning · ce8c0137
      Noralf Trønnes authored
      This warning is seen on 64-bit builds in functions:
         'mipi_dbi_typec1_command':
         'mipi_dbi_typec3_command_read':
         'mipi_dbi_typec3_command':
      
      >> drivers/gpu/drm/tinydrm/mipi-dbi.c:65:20: warning: field width specifier '*' expects argument of type 'int', but argument 5 has type 'size_t {aka long unsigned int}' [-Wformat=]
            DRM_DEBUG_DRIVER("cmd=%02x, par=%*ph\n", cmd, len, data); \
                             ^
         include/drm/drmP.h:228:40: note: in definition of macro 'DRM_DEBUG_DRIVER'
           drm_printk(KERN_DEBUG, DRM_UT_DRIVER, fmt, ##__VA_ARGS__)
                                                 ^~~
      >> drivers/gpu/drm/tinydrm/mipi-dbi.c:671:2: note: in expansion of macro 'MIPI_DBI_DEBUG_COMMAND'
           MIPI_DBI_DEBUG_COMMAND(cmd, parameters, num);
           ^~~~~~~~~~~~~~~~~~~~~~
      
      Fix by casting 'len' to int in the macro MIPI_DBI_DEBUG_COMMAND().
      There is no chance of overflow.
      Signed-off-by: default avatarNoralf Trønnes <noralf@tronnes.org>
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      ce8c0137
    • Noralf Trønnes's avatar
      drm/tinydrm: mipi-dbi: Silence: ‘cmd’ may be used uninitialized · b401f343
      Noralf Trønnes authored
      Fix this warning:
      drivers/gpu/drm/tinydrm/mipi-dbi.c: In function ‘mipi_dbi_debugfs_command_write’:
      drivers/gpu/drm/tinydrm/mipi-dbi.c:905:8: warning: ‘cmd’ may be used uninitialized in this function [-Wmaybe-uninitialized]
        ret = mipi_dbi_command_buf(mipi, cmd, parameters, i);
              ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
      
      cmd can't be used uninitialized, but to satisfy the compiler,
      initialize it to zero.
      Signed-off-by: default avatarNoralf Trønnes <noralf@tronnes.org>
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      b401f343
    • Linus Torvalds's avatar
      Merge tag 'usercopy-v4.11-rc1.fix' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux · d5500a07
      Linus Torvalds authored
      Pull usercopy test fix from Kees Cook:
       "Fix for non-MMU ARM testing, from Arnd Bergmann"
      
      * tag 'usercopy-v4.11-rc1.fix' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
        usercopy: ARM NOMMU has no 64-bit get_user
      d5500a07
  3. 23 Feb, 2017 7 commits
    • Linus Torvalds's avatar
      Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · b2e3c431
      Linus Torvalds authored
      Pull ARM SoC driver updates from Arnd Bergmann:
       "Driver updates for ARM SoCs.
      
        A handful of driver changes this time around. The larger changes are:
      
         - Reset drivers for hi3660 and zx2967
      
         - AHCI driver for Davinci, acked by Tejun and brought in here due to
           platform dependencies
      
         - Cleanups of atmel-ebi (External Bus Interface)
      
         - Tweaks for Rockchip GRF (General Register File) usage (kitchensink
           misc register range on the SoCs)
      
         - PM domains changes for support of two new ZTE SoCs (zx296718 and
           zx2967)"
      
      * tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (53 commits)
        soc: samsung: pmu: Add register defines for pad retention control
        reset: make zx2967 explicitly non-modular
        reset: core: fix reset_control_put
        soc: samsung: pm_domains: Read domain name from the new label property
        soc: samsung: pm_domains: Remove message about failed memory allocation
        soc: samsung: pm_domains: Remove unused name field
        soc: samsung: pm_domains: Use full names in subdomains registration log
        sata: ahci-da850: un-hardcode the MPY bits
        sata: ahci-da850: add a workaround for controller instability
        sata: ahci: export ahci_do_hardreset() locally
        sata: ahci-da850: implement a workaround for the softreset quirk
        sata: ahci-da850: add device tree match table
        sata: ahci-da850: get the sata clock using a connection id
        soc: samsung: pmu: Remove duplicated define for ARM_L2_OPTION register
        memory: atmel-ebi: Enable the SMC clock if specified
        soc: samsung: pmu: Remove unused and duplicated defines
        memory: atmel-ebi: Properly handle multiple reference to the same CS
        memory: atmel-ebi: Fix the test to enable generic SMC logic
        soc: samsung: pm_domains: Add new Exynos5433 compatible
        soc: samsung: pmu: Add dummy support for Exynos5433 SoC
        ...
      b2e3c431
    • Linus Torvalds's avatar
      Merge tag 'armsoc-dt64' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · c61c15e0
      Linus Torvalds authored
      Pull ARM 64-bit DT updates from Arnd Bergmann:
       "ARM64 DT updates are fairly small this time, only two new SoCs and a
        handful of new machines get added, all of them similar to other
        hardware we already support.
      
        New SoC:
      
         - HiSilicon Kirin960/Hi3660 and HiKey960 development board
      
         - NXP LS1012a with three reference boards:
              http://www.nxp.com/products/microcontrollers-and-processors/arm-processors/qoriq-layerscape-arm-processors/qoriq-layerscape-1012a-low-power-communication-processor:LS1012A
      
        New development board:
      
         - Banana Pi M64, based on Allwinner A64:
              http://www.banana-pi.org/m64.html
      
         - SolidRun MACCHIATOBin based on Marvell Armada 8K:
              https://www.solid-run.com/marvell-armada-family/armada-8040-community-board/
      
         - Broadcom BCM958712DxXMC NorthStar2 reference board (another one)
      
        A lot of platforms improve support for existing machines by adding
        extra devices for which a binding and driver is availabe:
      
        Allwinner:
         - MMC, USB
      
        ARM Juno:
         - Coresight, STM
      
        Broadcom:
         - NS2 GICv2m irqchip and PCIe
      
        Marvell:
         - Armada 3700 SPI, I2C, ethernet switch
      
        Mediatek:
         - MT8173 thermal
      
        NXP i.MX:
         - LS1046A thermal
      
        Qualcomm:
         - coresight on MSM8916, HDMI, WCNSS, SCM
      
        Renesas:
         - r8a779[56] thermal, powerdomain, ethernet, sound, pwm, can, can fd
      
        Rockchip:
         - thermal, eDP, pinctrl enhancements
      
        Samsung:
         - TM2 touchkey, Exynos5433 HDMI and power management improvements
      
        UniPhier:
         - SD reset, eMMC controller
      
        ZTE:
         - oppv2 cpufreq"
      
      * tag 'armsoc-dt64' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (110 commits)
        arm64: dts: qcom: Add msm8916 CoreSight components
        arm64: dts: marvell: adjust name of sd-mmc-gop clock in syscon
        arm64: allwinner: add BananaPi-M64 support
        arm64: allwinner: a64: add UART1 pin nodes
        arm64: allwinner: pine64: add MMC support
        arm64: allwinner: a64: Increase the MMC max frequency
        arm64: allwinner: a64: Add MMC pinctrl nodes
        arm64: allwinner: a64: Add MMC nodes
        dt-bindings: clockgen: Add compatible string for LS1012A
        Documentation: DT: add LS1012A compatible for SCFG and DCFG
        Documentation: DT: Add entry for FSL LS1012A RDB, FRDM, QDS boards
        arm64: dts: marvell: add generic-ahci compatibles for CP110 ahci
        arm64: tegra: Use symbolic reset identifiers
        arm64: dts: r8a7796: Mark EthernetAVB device node disabled
        arm64: dts: r8a7795: Mark EthernetAVB device node disabled
        arm64: dts: r8a7795: tidyup audma definition order
        arm64: dts: r8a7796: Link ARM GIC to clock and clock domain
        arm64: dts: r8a7795: Link ARM GIC to clock and clock domain
        arm64: dts: r8a7796: Add R-Car Gen3 thermal support
        arm64: dts: r8a7795: Add R-Car Gen3 thermal support
        ...
      c61c15e0
    • Linus Torvalds's avatar
      Merge tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 195849ea
      Linus Torvalds authored
      Pull ARM DT updates from Arnd Bergmann:
       "A total of 380 patches this time, mostly adding support for more
        hardware in the device tree descriptions. There is not much exciting
        here for 4.11, but I've tried my best to condense the information from
        the pull requests I got into a readable summary.
      
        Noteworthy changes to existing platforms include:
      
         - The GIC memory map was a bit wrong almost everywhere and now gets
           fixed up
      
         - The Allwinner platforms convert to the generic pinmux properties
      
         - The Marvell EBU platforms now use the new DSA binding
      
         - Samsung Exynos4212 was unused and gets removed
      
         - The Renesas power management got improved
      
        New production machines:
      
         - Lego Mindstorms EV3:
              https://www.lego.com/en-us/mindstorms/about-ev3
      
         - Beelink X2 Android media box:
              http://linux-sunxi.org/Beelink_X2
      
         - "Romulus" baseboard management controller for OpenPower
      
         - Axentia TSE-850 Data Radio Channel (DARC) encoder:
              http://www.axentia.se/db/equipment.html
      
         - Luxul XAP-1410 and XWR-1200 wireless access points:
              https://luxul.com/xap-1410
      
        New SoCs:
      
         - Allwinner H2+ and V3s, both minor variations of already supported
           chips:
              http://www.allwinnertech.com/index.php?c=product&a=index&id=38
      
         - Marvell Prestera DX packet processors based on Armada XP
           architecture:
              http://www.marvell.com/switching/prestera-dx/
      
         - Samsung Exynos4412 Prime gets added, a minor variation of
           Exynos4412
      
        New developer and reference boards:
      
         - Lichee Pi One, Lichee Pi Zero and Orange Pi Zero, all based on
           Allwinner SoCs:
              http://linux-sunxi.org/LicheePi_One
              http://www.orangepi.org/orangepizero/
      
         - SAMA5d36ek Reference platform:
              http://www.atmel.com/tools/sama5d36-ek.aspx
      
         - Beaglebone Green Wireless and Black Wireless:
              https://beagleboard.org/black-wireless
              https://beagleboard.org/green-wireless
      
         - phyCORE-AM335x System on Module:
              http://phytec.com/products/system-on-modules/phycore/am335x/
      
         - New revision of "vf610-zii" Zodiac Inflight Innovations board
      
         - Various i.MX System-on-Module: Is.IoT MX6UL, SavageBoard, Engicam
           i.Core:
              http://www.opossom.com/english/index.html
              http://www.savageboard.org/
              http://www.engicam.com/en/products/embedded/som/sodimm/is-iot-mx6ul
              http://www.engicam.com/en/products/embedded/som/sodimm/i-core-m6s-dl-d-q
      
         - Liebherr (LWN) monitor 6 based on i.MX6 Quad, no idea what this is
      
         - Cleanups and bugfixes on at91, bcm53xx, i.MX, mvebu, omap, oxnas,
           qcom, rockchip, sti, stm32 and tegra
      
        New device supports added to some boards and SoCs, briefly by platform:
      
         - Allwinner: SPDIF, A33 cpufreq, A33 Mali GPU
      
         - Aspeed: network, ipmi bt, gpio, pinmux
      
         - Broadcom: video encoder for raspberry pi, qspi, ethernet, sd/mmc
      
         - TI DaVinci: gpio, lcdc, usb, video-in, uart
      
         - TI Keystone 2: MSM RAM, power/reset, uart
      
         - Mediatek MT2701: clocks, iommu, spi, nand, adc, thermal
      
         - Marvell EBU: ethernet switch on Turris Omnia
      
         - NXP i.MX: otp ram, USB, wifi, bluetooth, spdif, spi, pmic, eeprom,
           mmc, nand
      
         - TI OMAP:
      
         - Qualcomm: coresight, gyro/accelerometer, hdmi
      
         - Renesas: pmic, soc-id
      
         - Rockchip: qos
      
         - Samsung: audio on Odroid-X
      
         - Socfpga: FPGA manager, i2c, led, can, watchdog, nand, power monitor
      
         - STi: video in/out
      
         - STM32: timer, pwm, i2c, rtc, add, i2s
      
         - NVIDIA Tegra: tpm
      
         - Uniphier: mmc/sd pinmux"
      
      * tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (380 commits)
        ARM: dts: armada-385-linksys: fix DSA compatible property
        ARM: dts: Fix typo in armada-xp-98dx4251
        ARM: DTS: Fix register map for virt-capable GIC
        dt-bindings: arm,gic: Fix binding example for a virt-capable GIC
        ARM: dts: sun8i: sinlinx: Enable audio nodes
        ARM: dts: sun8i: parrot: Enable audio nodes
        ARM: dts: sun8i: Add audio codec, dai and card for A33
        ARM: dts: Add EMAC AXI settings for Arria10
        ARM: dts: am335x-chiliboard: Support charger
        ARM: dts: am335x-chiliboard: Support power button
        ARM: sun8i: dt: Add mali node
        dt-bindings: gpu: Add Mali Utgard bindings
        ARM: dts: stm32: Add I2C1 support for STM32429 eval board
        ARM: dts: stm32: Add I2C1 support for STM32F429 SoC
        ARM: dts: stm32: Use clock DT binding definition on stm32f429 family
        dt-bindings: mfd: stm32f4: Add missing binding definition
        dt-bindings: mfd: stm32f4: Fix STM32F4_X_CLOCK() macro
        ARM: dts: stm32: Enable pwm1 and pwm3 for stm32f469-disco
        ARM: dts: stm32: add Timers driver for stm32f429 MCU
        ARM: dts: add the AB8500 sysclk to the device trees
        ...
      195849ea
    • Linus Torvalds's avatar
      Merge tag 'armsoc-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 54fff785
      Linus Torvalds authored
      Pull ARM SoC defconfig updates from Arnd Bergmann:
       "Defconfig additions, removals, etc. Almost all of them just turn on
        drivers that we want on some platform, usually after the driver has
        been merged into mainline.
      
        There is now a new defconfig file for tango4"
      
      * tag 'armsoc-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (44 commits)
        ARM: multi_v7_defconfig: enable pstore configs
        ARM: multi_v7_defconfig: enable some newly added crypto modules
        ARM: davinci_all_defconfig: enable SATA modules
        arm64: defconfig: enable CONFIG_MTD_NAND and CONFIG_MTD_NAND_DENALI_DT
        arm64: defconfig: enable CONFIG_MTD_BLOCK
        ARM: Import tango4_defconfig
        ARM: omap2plus_defconfig: Enable support for RTC M41T80
        ARM: omap2plus_defconfig: Enable support for micrell phys
        ARM: vf610m4: defconfig: enable EXT4 filesystem
        ARM: omap2plus_defconfig: Fix probe errors on UARTs 5 and 6
        arm64: defconfig: Enable NUMA and NUMA_BALANCING
        arm64: defconfig: enable SMMUv3 config
        ARM: davinci_all_defconfig: enable iio
        ARM: Keystone: Enable ARCH_HAS_RESET_CONTROLLER
        ARM: configs: stm32: Add RTC support in STM32 defconfig
        ARM: defconfig: qcom: add APQ8060 DragonBoard devices
        ARM: qcom_defconfig: enable thermal sensors
        ARM: qcom_defconfig: add ahci configs
        ARM: qcom_defconfig: add pcie and atl1c ethernet configs
        ARM: qcom_defconfig: add usb related configs
        ...
      54fff785
    • Linus Torvalds's avatar
      Merge tag 'armsoc-arm64' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · c35675f3
      Linus Torvalds authored
      Pull ARM SoC 64-bit updates from Arnd Bergmann:
       "Changes to platform code for 64-bit ARM platforms, only trivial stuff
        this time, a few defconfig changes to enable drivers, and a new entry
        for the Cavium ThunderX2 platform"
      
      * tag 'armsoc-arm64' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
        MAINTAINERS: Add Cavium ThunderX2 entry
        arm64: add ARCH_THUNDER2 to defconfig
        arm64: add THUNDER2 processor family
        MAINTAINERS: Extend ARM/Mediatek SoC support section
        arm64: defconfig: enable CONFIG_MMC_SDHCI_CADENCE
        arm64: defconfig: enable XORv2 for Marvell Armada 7K/8K
      c35675f3
    • Linus Torvalds's avatar
      Merge tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 6ae52c65
      Linus Torvalds authored
      Pull ARM SoC platform updates from Arnd Bergmann:
       "In the SoC branch we normally collect classic arch/arm/mach-*
        contents, i.e. C code changes for SoC platforms. This release cycle
        the diffstat is quite nice, in that we're removing 3x the amount of
        code that's being added.
      
        The main reason for this is that there's a removal of camera drivers
        for Freescale i.MX chips (driver was removed so the device
        registration isn't needed any more). There's also removal of display
        initialization code for OMAP that is no longer needed.
      
        The rest are mostly minor tweaks and cleanups; constification on
        Samsung platforms, cleanup of ux500 platform data, purge of other
        unused platform data/device seutp on i.MX and other good stuff.
      
        New SoC support this cycle is for two Allwinner platforms, H2+ and
        V3s"
      
      * tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (55 commits)
        ARM: ux500: remove deleted file from Makefile
        ARM: ep93xx: Disable TS-72xx watchdog before uncompressing
        ARM: ux500: cut some platform data
        MAINTAINERS: Update for the current location of the bcm2835 tree.
        ARM: davinci: remove BUG_ON() from da850_register_sata()
        ARM: davinci: da850: model the SATA refclk
        ARM: davinci: da850: add con_id for the SATA clock
        ARM: davinci: da8xx-dt: add OF_DEV_AUXDATA entry for SATA
        arm: mvebu: support for SMP on 98DX3336 SoC
        dt-bindings: video: exynos7-decon: Remove obsolete samsung,power-domain property
        soc: dove: constify reset_control_ops structures
        ARM: mv78xx0: fix possible PCI buffer overflow
        MAINTAINERS: transfer maintainership for the EZX platform
        ARM: shmobile: rcar-gen2: Add more register documentation
        ARM: tegra: paz00: Fix __initdata placement
        ARM: OMAP: clock: Remove unused mpurate cmdline option
        ARM: davinci: add skeleton for pdata-quirks
        arm: sunxi: add support for V3s SoC
        ARM: OMAP2+: omap_hwmod: Add support for earlycon
        arm: hisi: drop extern hip01_cpu_die
        ...
      6ae52c65
    • Linus Torvalds's avatar
      Merge tag 'armsoc-fixes-nc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · af8999f6
      Linus Torvalds authored
      Pull ARM SoC non-urgent fixes from Arnd Bergmann:
       "We sometimes collect non-critical fixes that come in during the later
        part of the merge window in a branch for the next release instead, and
        this is that contents for v4.11.
      
        Most of these are OMAP fixes, dealing with OMAP36/37 detection, quirks
        and setup. There's also some fixes for Davinci and a Kconfig fix for
        SCPI to only enable on ARM{,64}"
      
      * tag 'armsoc-fixes-nc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
        firmware: arm_scpi: Add hardware dependencies
        ARM: OMAP3: Fix SoC detection of OMAP36/37 Family
        ARM: OMAP5: Add HWMOD_SWSUP_SIDLE_ACT flag for UART
        ARM: dts: Fix compatible for ti81xx uarts for 8250
        ARM: dts: Fix am335x and dm814x scm syscon to probe children
        ARM: OMAP2+: Fix init for multiple quirks for the same SoC
        ARM: dts: Fix omap3 off mode pull defines
        bus: da850-mstpri: fix my e-mail address
        ARM: davinci: da850: fix da850_set_pll0rate()
        ARM: davinci: da850: coding style fix
      af8999f6