1. 11 7月, 2015 6 次提交
  2. 01 7月, 2015 4 次提交
  3. 30 6月, 2015 4 次提交
    • L
      Merge tag 'libnvdimm-for-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/nvdimm · 88793e5c
      Linus Torvalds 提交于
      Pull libnvdimm subsystem from Dan Williams:
       "The libnvdimm sub-system introduces, in addition to the
        libnvdimm-core, 4 drivers / enabling modules:
      
        NFIT:
          Instantiates an "nvdimm bus" with the core and registers memory
          devices (NVDIMMs) enumerated by the ACPI 6.0 NFIT (NVDIMM Firmware
          Interface table).
      
          After registering NVDIMMs the NFIT driver then registers "region"
          devices.  A libnvdimm-region defines an access mode and the
          boundaries of persistent memory media.  A region may span multiple
          NVDIMMs that are interleaved by the hardware memory controller.  In
          turn, a libnvdimm-region can be carved into a "namespace" device and
          bound to the PMEM or BLK driver which will attach a Linux block
          device (disk) interface to the memory.
      
        PMEM:
          Initially merged in v4.1 this driver for contiguous spans of
          persistent memory address ranges is re-worked to drive
          PMEM-namespaces emitted by the libnvdimm-core.
      
          In this update the PMEM driver, on x86, gains the ability to assert
          that writes to persistent memory have been flushed all the way
          through the caches and buffers in the platform to persistent media.
          See memcpy_to_pmem() and wmb_pmem().
      
        BLK:
          This new driver enables access to persistent memory media through
          "Block Data Windows" as defined by the NFIT.  The primary difference
          of this driver to PMEM is that only a small window of persistent
          memory is mapped into system address space at any given point in
          time.
      
          Per-NVDIMM windows are reprogrammed at run time, per-I/O, to access
          different portions of the media.  BLK-mode, by definition, does not
          support DAX.
      
        BTT:
          This is a library, optionally consumed by either PMEM or BLK, that
          converts a byte-accessible namespace into a disk with atomic sector
          update semantics (prevents sector tearing on crash or power loss).
      
          The sinister aspect of sector tearing is that most applications do
          not know they have a atomic sector dependency.  At least today's
          disk's rarely ever tear sectors and if they do one almost certainly
          gets a CRC error on access.  NVDIMMs will always tear and always
          silently.  Until an application is audited to be robust in the
          presence of sector-tearing the usage of BTT is recommended.
      
        Thanks to: Ross Zwisler, Jeff Moyer, Vishal Verma, Christoph Hellwig,
        Ingo Molnar, Neil Brown, Boaz Harrosh, Robert Elliott, Matthew Wilcox,
        Andy Rudoff, Linda Knippers, Toshi Kani, Nicholas Moulin, Rafael
        Wysocki, and Bob Moore"
      
      * tag 'libnvdimm-for-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/nvdimm: (33 commits)
        arch, x86: pmem api for ensuring durability of persistent memory updates
        libnvdimm: Add sysfs numa_node to NVDIMM devices
        libnvdimm: Set numa_node to NVDIMM devices
        acpi: Add acpi_map_pxm_to_online_node()
        libnvdimm, nfit: handle unarmed dimms, mark namespaces read-only
        pmem: flag pmem block devices as non-rotational
        libnvdimm: enable iostat
        pmem: make_request cleanups
        libnvdimm, pmem: fix up max_hw_sectors
        libnvdimm, blk: add support for blk integrity
        libnvdimm, btt: add support for blk integrity
        fs/block_dev.c: skip rw_page if bdev has integrity
        libnvdimm: Non-Volatile Devices
        tools/testing/nvdimm: libnvdimm unit test infrastructure
        libnvdimm, nfit, nd_blk: driver for BLK-mode access persistent memory
        nd_btt: atomic sector updates
        libnvdimm: infrastructure for btt devices
        libnvdimm: write blk label set
        libnvdimm: write pmem label set
        libnvdimm: blk labels and namespace instantiation
        ...
      88793e5c
    • L
      Merge tag 'dmaengine-4.2-rc1' of git://git.infradead.org/users/vkoul/slave-dma · 1bc5e157
      Linus Torvalds 提交于
      Pull dmaengine updates from Vinod Koul:
       "This time we have support for few new devices, few new features and
        odd fixes spread thru the subsystem.
      
        New devices added:
         - support for CSRatlas7 dma controller
         - Allwinner H3(sun8i) controller
         - TI DMA crossbar driver on DRA7x
         - new pxa driver
      
        New features added:
         - memset support is bought back now that we have a user in xdmac controller
         - interleaved transfers support different source and destination strides
         - supporting DMA routers and configuration thru DT
         - support for reusing descriptors
         - xdmac memset and interleaved transfer support
         - hdmac support for interleaved transfers
         - omap-dma support for memcpy
      
        Others:
         - Constify platform_device_id
         - mv_xor fixes and improvements"
      
      * tag 'dmaengine-4.2-rc1' of git://git.infradead.org/users/vkoul/slave-dma: (46 commits)
        dmaengine: xgene: fix file permission
        dmaengine: fsl-edma: clear pending interrupts on initialization
        dmaengine: xdmac: Add memset support
        Documentation: dmaengine: document DMA_CTRL_ACK
        dmaengine: virt-dma: don't always free descriptor upon completion
        dmaengine: Revert "drivers/dma: remove unused support for MEMSET operations"
        dmaengine: hdmac: Implement interleaved transfers
        dmaengine: Move icg helpers to global header
        dmaengine: mv_xor: improve descriptors list handling and reduce locking
        dmaengine: mv_xor: Enlarge descriptor pool size
        dmaengine: mv_xor: add support for a38x command in descriptor mode
        dmaengine: mv_xor: Rename function for consistent naming
        dmaengine: mv_xor: bug fix for racing condition in descriptors cleanup
        dmaengine: pl330: fix wording in mcbufsz message
        dmaengine: sirf: add CSRatlas7 SoC support
        dmaengine: xgene-dma: Fix "incorrect type in assignement" warnings
        dmaengine: fix kernel-doc documentation
        dmaengine: pxa_dma: add support for legacy transition
        dmaengine: pxa_dma: add debug information
        dmaengine: pxa: add pxa dmaengine driver
        ...
      1bc5e157
    • L
      Merge tag 'please-pull-misc-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux · f199b663
      Linus Torvalds 提交于
      Pull ia64 updates from Tony Luck:
       "Pair of ia64 cleanups"
      
      * tag 'please-pull-misc-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
        ia64: Use setup_timer
        ia64: export flush_icache_range for module use
      f199b663
    • L
      Merge tag 'linux-kselftest-4.2-rc1' of... · d93a74a9
      Linus Torvalds 提交于
      Merge tag 'linux-kselftest-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest
      
      Pull kselftest update from Shuah Khan:
       "This update adds two new test suites: futex and seccomp.
      
        In addition, it includes fixes for bugs in timers, other tests, and
        compile framework.  It introduces new quicktest feature to enable
        users to choose to run tests that complete in a short time"
      
      * tag 'linux-kselftest-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
        selftests: add quicktest support
        selftests: add seccomp suite
        selftest, x86: fix incorrect comment
        tools selftests: Fix 'clean' target with make 3.81
        selftests/futex: Add .gitignore
        kselftest: Add exit code defines
        selftests: Add futex tests to the top-level Makefile
        selftests/futex: Increment ksft pass and fail counters
        selftests/futex: Update Makefile to use lib.mk
        selftests: Add futex functional tests
        kselftests: timers: Check _ALARM clockids are supported before suspending
        kselftests: timers: Ease alarmtimer-suspend unreasonable latency value
        kselftests: timers: Increase delay between suspends in alarmtimer-suspend
        selftests/exec: do not install subdir as it is already created
        selftests/ftrace: install test.d
        selftests: copy TEST_DIRS to INSTALL_PATH
        Test compaction of mlocked memory
        selftests/mount: output WARN messages when mount test skipped
        selftests/timers: Make git ignore all binaries in timers test suite
      d93a74a9
  4. 29 6月, 2015 3 次提交
    • L
      Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu · c63f887b
      Linus Torvalds 提交于
      Pull m68knommu updates from Greg Ungerer:
       "Only a couple of small changes.
      
        Improved the m68knommu MAINTAINERS entry to make it clearer which m68k
        parts this applies to, and a print format clean up"
      
      * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
        m68k: improve m68knommu MAINTAINERS entry
        m68k: Use vsprintf %pM extension
      c63f887b
    • L
      Merge branch 'for-linus-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml · 21dc2e6c
      Linus Torvalds 提交于
      Pull UML updates from Richard Weinberger:
      
       - remove hppfs ("HonePot ProcFS")
      
       - initial support for musl libc
      
       - uaccess cleanup
      
       - random cleanups and bug fixes all over the place
      
      * 'for-linus-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml: (21 commits)
        um: Don't pollute kernel namespace with uapi
        um: Include sys/types.h for makedev(), major(), minor()
        um: Do not use stdin and stdout identifiers for struct members
        um: Do not use __ptr_t type for stack_t's .ss pointer
        um: Fix mconsole dependency
        um: Handle tracehook_report_syscall_entry() result
        um: Remove copy&paste code from init.h
        um: Stop abusing __KERNEL__
        um: Catch unprotected user memory access
        um: Fix warning in setup_signal_stack_si()
        um: Rework uaccess code
        um: Add uaccess.h to ldt.c
        um: Add uaccess.h to syscalls_64.c
        um: Add asm/elf.h to vma.c
        um: Cleanup mem_32/64.c headers
        um: Remove hppfs
        um: Move syscall() declaration into os.h
        um: kernel: ksyms: Export symbol syscall() for fixing modpost issue
        um/os-Linux: Use char[] for syscall_stub declarations
        um: Use char[] for linker script address declarations
        ...
      21dc2e6c
    • L
      Merge tag 'vfio-v4.2-rc1' of git://github.com/awilliam/linux-vfio · b779157d
      Linus Torvalds 提交于
      Pull VFIO updates from Alex Williamson:
      
       - fix race with device reference versus driver release (Alex Williamson)
      
       - add reset hooks and Calxeda xgmac reset for vfio-platform (Eric Auger)
      
       - enable vfio-platform for ARM64 (Eric Auger)
      
       - tag Baptiste Reynal as vfio-platform sub-maintainer (Alex Williamson)
      
      * tag 'vfio-v4.2-rc1' of git://github.com/awilliam/linux-vfio:
        MAINTAINERS: Add vfio-platform sub-maintainer
        VFIO: platform: enable ARM64 build
        VFIO: platform: Calxeda xgmac reset module
        VFIO: platform: populate the reset function on probe
        VFIO: platform: add reset callback
        VFIO: platform: add reset struct and lookup table
        vfio/pci: Fix racy vfio_device_get_from_dev() call
      b779157d
  5. 28 6月, 2015 6 次提交
    • L
      Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/audit · 4a10a917
      Linus Torvalds 提交于
      Pull audit updates from Paul Moore:
       "Four small audit patches for v4.2, all bug fixes.  Only 10 lines of
        change this time so very unremarkable, the patch subject lines pretty
        much tell the whole story"
      
      * 'upstream' of git://git.infradead.org/users/pcmoore/audit:
        audit: Fix check of return value of strnlen_user()
        audit: obsolete audit_context check is removed in audit_filter_rules()
        audit: fix for typo in comment to function audit_log_link_denied()
        lsm: rename duplicate labels in LSM_AUDIT_DATA_TASK audit message type
      4a10a917
    • L
      Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security · e22619a2
      Linus Torvalds 提交于
      Pull security subsystem updates from James Morris:
       "The main change in this kernel is Casey's generalized LSM stacking
        work, which removes the hard-coding of Capabilities and Yama stacking,
        allowing multiple arbitrary "small" LSMs to be stacked with a default
        monolithic module (e.g.  SELinux, Smack, AppArmor).
      
        See
              https://lwn.net/Articles/636056/
      
        This will allow smaller, simpler LSMs to be incorporated into the
        mainline kernel and arbitrarily stacked by users.  Also, this is a
        useful cleanup of the LSM code in its own right"
      
      * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: (38 commits)
        tpm, tpm_crb: fix le64_to_cpu conversions in crb_acpi_add()
        vTPM: set virtual device before passing to ibmvtpm_reset_crq
        tpm_ibmvtpm: remove unneccessary message level.
        ima: update builtin policies
        ima: extend "mask" policy matching support
        ima: add support for new "euid" policy condition
        ima: fix ima_show_template_data_ascii()
        Smack: freeing an error pointer in smk_write_revoke_subj()
        selinux: fix setting of security labels on NFS
        selinux: Remove unused permission definitions
        selinux: enable genfscon labeling for sysfs and pstore files
        selinux: enable per-file labeling for debugfs files.
        selinux: update netlink socket classes
        signals: don't abuse __flush_signals() in selinux_bprm_committed_creds()
        selinux: Print 'sclass' as string when unrecognized netlink message occurs
        Smack: allow multiple labels in onlycap
        Smack: fix seq operations in smackfs
        ima: pass iint to ima_add_violation()
        ima: wrap event related data to the new ima_event_data structure
        integrity: add validity checks for 'path' parameter
        ...
      e22619a2
    • L
      Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus · 78c10e55
      Linus Torvalds 提交于
      Pull MIPS updates from Ralf Baechle:
      
       - Improvements to the tlb_dump code
       - KVM fixes
       - Add support for appended DTB
       - Minor improvements to the R12000 support
       - Minor improvements to the R12000 support
       - Various platform improvments for BCM47xx
       - The usual pile of minor cleanups
       - A number of BPF fixes and improvments
       - Some improvments to the support for R3000 and DECstations
       - Some improvments to the ATH79 platform support
       - A major patchset for the JZ4740 SOC adding support for the CI20 platform
       - Add support for the Pistachio SOC
       - Minor BMIPS/BCM63xx platform support improvments.
       - Avoid "SYNC 0" as memory barrier when unlocking spinlocks
       - Add support for the XWR-1750 board.
       - Paul's __cpuinit/__cpuinitdata cleanups.
       - New Malta CPU board support large memory so enable ZONE_DMA32.
      
      * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (131 commits)
        MIPS: spinlock: Adjust arch_spin_lock back-off time
        MIPS: asmmacro: Ensure 64-bit FP registers are used with MSA
        MIPS: BCM47xx: Simplify handling SPROM revisions
        MIPS: Cobalt Don't use module_init in non-modular MTD registration.
        MIPS: BCM47xx: Move NVRAM driver to the drivers/firmware/
        MIPS: use for_each_sg()
        MIPS: BCM47xx: Don't select BCMA_HOST_PCI
        MIPS: BCM47xx: Add helper variable for storing NVRAM length
        MIPS: IRQ/IP27: Move IRQ allocation API to platform code.
        MIPS: Replace smp_mb with release barrier function in unlocks.
        MIPS: i8259: DT support
        MIPS: Malta: Basic DT plumbing
        MIPS: include errno.h for ENODEV in mips-cm.h
        MIPS: Define GCR_GIC_STATUS register fields
        MIPS: BPF: Introduce BPF ASM helpers
        MIPS: BPF: Use BPF register names to describe the ABI
        MIPS: BPF: Move register definition to the BPF header
        MIPS: net: BPF: Replace RSIZE with SZREG
        MIPS: BPF: Free up some callee-saved registers
        MIPS: Xtalk: Update xwidget.h with known Xtalk device numbers
        ...
      78c10e55
    • L
      Merge branch 'for-4.2' of git://linux-nfs.org/~bfields/linux · d2c3ac7e
      Linus Torvalds 提交于
      Pull nfsd updates from Bruce Fields:
       "A relatively quiet cycle, with a mix of cleanup and smaller bugfixes"
      
      * 'for-4.2' of git://linux-nfs.org/~bfields/linux: (24 commits)
        sunrpc: use sg_init_one() in krb5_rc4_setup_enc/seq_key()
        nfsd: wrap too long lines in nfsd4_encode_read
        nfsd: fput rd_file from XDR encode context
        nfsd: take struct file setup fully into nfs4_preprocess_stateid_op
        nfsd: refactor nfs4_preprocess_stateid_op
        nfsd: clean up raparams handling
        nfsd: use swap() in sort_pacl_range()
        rpcrdma: Merge svcrdma and xprtrdma modules into one
        svcrdma: Add a separate "max data segs macro for svcrdma
        svcrdma: Replace GFP_KERNEL in a loop with GFP_NOFAIL
        svcrdma: Keep rpcrdma_msg fields in network byte-order
        svcrdma: Fix byte-swapping in svc_rdma_sendto.c
        nfsd: Update callback sequnce id only CB_SEQUENCE success
        nfsd: Reset cb_status in nfsd4_cb_prepare() at retrying
        svcrdma: Remove svc_rdma_xdr_decode_deferred_req()
        SUNRPC: Move EXPORT_SYMBOL for svc_process
        uapi/nfs: Add NFSv4.1 ACL definitions
        nfsd: Remove dead declarations
        nfsd: work around a gcc-5.1 warning
        nfsd: Checking for acl support does not require fetching any acls
        ...
      d2c3ac7e
    • L
      Merge tag 'gfs2-merge-window' of git://git.kernel.org:/pub/scm/linux/kernel/git/gfs2/linux-gfs2 · 546fac60
      Linus Torvalds 提交于
      Pull GFS2 updates from Bob Peterson:
       "Here are the patches we've accumulated for GFS2 for the current
        upstream merge window.  We have a good mixture this time.  Here are
        some of the features:
      
         - Fix a problem with RO mounts writing to the journal.
      
         - Further improvements to quotas on GFS2.
      
         - Added support for rename2 and RENAME_EXCHANGE on GFS2.
      
         - Increase performance by making glock lru_list less of a bottleneck.
      
         - Increase performance by avoiding unnecessary buffer_head releases.
      
         - Increase performance by using average glock round trip time from all CPUs.
      
         - Fixes for some compiler warnings and minor white space issues.
      
         - Other misc bug fixes"
      
      * tag 'gfs2-merge-window' of git://git.kernel.org:/pub/scm/linux/kernel/git/gfs2/linux-gfs2:
        GFS2: Don't brelse rgrp buffer_heads every allocation
        GFS2: Don't add all glocks to the lru
        gfs2: Don't support fallocate on jdata	files
        gfs2: s64 cast for negative quota value
        gfs2: limit quota log messages
        gfs2: fix quota updates on block boundaries
        gfs2: fix shadow warning in gfs2_rbm_find()
        gfs2: kerneldoc warning fixes
        gfs2: convert simple_str to kstr
        GFS2: make sure S_NOSEC flag isn't overwritten
        GFS2: add support for rename2 and RENAME_EXCHANGE
        gfs2: handle NULL rgd in set_rgrp_preferences
        GFS2: inode.c: indent with TABs, not spaces
        GFS2: mark the journal idle to fix ro mounts
        GFS2: Average in only non-zero round-trip times for congestion stats
        GFS2: Use average srttb value in congestion calculations
      546fac60
    • L
      Revert "jbd2: speedup jbd2_journal_dirty_metadata()" · ebeaa8dd
      Linus Torvalds 提交于
      This reverts commit 2143c196.
      
      This commit seems to be the cause of the following jbd2 assertion
      failure:
      
         ------------[ cut here ]------------
         kernel BUG at fs/jbd2/transaction.c:1325!
         invalid opcode: 0000 [#1] SMP
         Modules linked in: bnep bluetooth fuse ip6t_rpfilter ip6t_REJECT nf_reject_ipv6 nf_conntrack_ipv6 ...
         CPU: 7 PID: 5509 Comm: gcc Not tainted 4.1.0-10944-g2a298679 #1
         Hardware name:                  /DH87RL, BIOS RLH8710H.86A.0327.2014.0924.1645 09/24/2014
         task: ffff8803bf866040 ti: ffff880308528000 task.ti: ffff880308528000
         RIP: jbd2_journal_dirty_metadata+0x237/0x290
         Call Trace:
           __ext4_handle_dirty_metadata+0x43/0x1f0
           ext4_handle_dirty_dirent_node+0xde/0x160
           ? jbd2_journal_get_write_access+0x36/0x50
           ext4_delete_entry+0x112/0x160
           ? __ext4_journal_start_sb+0x52/0xb0
           ext4_unlink+0xfa/0x260
           vfs_unlink+0xec/0x190
           do_unlinkat+0x24a/0x270
           SyS_unlink+0x11/0x20
           entry_SYSCALL_64_fastpath+0x12/0x6a
         ---[ end trace ae033ebde8d080b4 ]---
      
      which is not easily reproducible (I've seen it just once, and then Ted
      was able to reproduce it once).  Revert it while Ted and Jan try to
      figure out what is wrong.
      
      Cc: Jan Kara <jack@suse.cz>
      Acked-by: NTheodore Ts'o <tytso@mit.edu>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      ebeaa8dd
  6. 27 6月, 2015 17 次提交
    • L
      Merge branch 'for-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq · e0dd880a
      Linus Torvalds 提交于
      Pull workqueue updates from Tejun Heo:
       "Most of the changes are around implementing and fixing fallouts from
        sysfs and internal interface to limit the CPUs available to all
        unbound workqueues to help isolating CPUs.  It needs more work as
        ordered workqueues can roam unrestricted but still is a significant
        improvement"
      
      * 'for-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:
        workqueue: fix typos in comments
        workqueue: move flush_scheduled_work() to workqueue.h
        workqueue: remove the lock from wq_sysfs_prep_attrs()
        workqueue: remove the declaration of copy_workqueue_attrs()
        workqueue: ensure attrs changes are properly synchronized
        workqueue: separate out and refactor the locking of applying attrs
        workqueue: simplify wq_update_unbound_numa()
        workqueue: wq_pool_mutex protects the attrs-installation
        workqueue: fix a typo
        workqueue: function name in the comment differs from the real function name
        workqueue: fix trivial typo in Documentation/workqueue.txt
        workqueue: Allow modifying low level unbound workqueue cpumask
        workqueue: Create low-level unbound workqueues cpumask
        workqueue: split apply_workqueue_attrs() into 3 stages
      e0dd880a
    • L
      Merge branch 'for-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup · bbe179f8
      Linus Torvalds 提交于
      Pull cgroup updates from Tejun Heo:
      
       - threadgroup_lock got reorganized so that its users can pick the
         actual locking mechanism to use.  Its only user - cgroups - is
         updated to use a percpu_rwsem instead of per-process rwsem.
      
         This makes things a bit lighter on hot paths and allows cgroups to
         perform and fail multi-task (a process) migrations atomically.
         Multi-task migrations are used in several places including the
         unified hierarchy.
      
       - Delegation rule and documentation added to unified hierarchy.  This
         will likely be the last interface update from the cgroup core side
         for unified hierarchy before lifting the devel mask.
      
       - Some groundwork for the pids controller which is scheduled to be
         merged in the coming devel cycle.
      
      * 'for-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
        cgroup: add delegation section to unified hierarchy documentation
        cgroup: require write perm on common ancestor when moving processes on the default hierarchy
        cgroup: separate out cgroup_procs_write_permission() from __cgroup_procs_write()
        kernfs: make kernfs_get_inode() public
        MAINTAINERS: add a cgroup core co-maintainer
        cgroup: fix uninitialised iterator in for_each_subsys_which
        cgroup: replace explicit ss_mask checking with for_each_subsys_which
        cgroup: use bitmask to filter for_each_subsys
        cgroup: add seq_file forward declaration for struct cftype
        cgroup: simplify threadgroup locking
        sched, cgroup: replace signal_struct->group_rwsem with a global percpu_rwsem
        sched, cgroup: reorganize threadgroup locking
        cgroup: switch to unsigned long for bitmasks
        cgroup: reorganize include/linux/cgroup.h
        cgroup: separate out include/linux/cgroup-defs.h
        cgroup: fix some comment typos
      bbe179f8
    • S
      power: axp288_charger: fix for API change · 4b703b1d
      Stephen Rothwell 提交于
      Caused by commit 843735b7 ("power: axp288_charger: axp288 charger
      driver") from the battery tree interacting with commit 046050f6
      ("extcon: Update the prototype of extcon_register_notifier() with enum
      extcon") from the extcon tree.
      Signed-off-by: NStephen Rothwell <sfr@canb.auug.org.au>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      4b703b1d
    • L
      Merge tag 'dma-buf-for-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/sumits/dma-buf · 93f0824c
      Linus Torvalds 提交于
      Pull dma-buf updates from Sumit Semwal:
       "Minor changes for 4.2
      
         - add ref-counting for kernel modules as exporters
         - minor code style fixes"
      
      * tag 'dma-buf-for-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/sumits/dma-buf:
        dma-buf: Minor coding style fixes
        dma-buf: add ref counting for module as exporter
      93f0824c
    • L
      Merge tag 'usb-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb · 2a298679
      Linus Torvalds 提交于
      Pull USB updates from Greg KH:
       "Here's the big USB patchset for 4.2-rc1.  As is normal these days, the
        majority of changes are in the gadget drivers, with a bunch of other
        small driver changes.
      
        All of these have been in linux-next with no reported issues"
      
      * tag 'usb-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (175 commits)
        usb: dwc3: Use ASCII space in Kconfig
        usb: chipidea: add work-around for Marvell HSIC PHY startup
        usb: chipidea: allow multiple instances to use default ci_default_pdata
        dt-bindings: Consolidate ChipIdea USB ci13xxx bindings
        phy: add Marvell HSIC 28nm PHY
        phy: Add Marvell USB 2.0 OTG 28nm PHY
        dt-bindings: Add Marvell PXA1928 USB and HSIC PHY bindings
        USB: ssb: use devm_kzalloc
        USB: ssb: fix error handling in ssb_hcd_create_pdev()
        usb: isp1760: check for null return from kzalloc
        cdc-acm: Add support of ATOL FPrint fiscal printers
        usb: chipidea: usbmisc_imx: Remove unneeded semicolon
        USB: usbtmc: add device quirk for Rigol DS6104
        USB: serial: mos7840: Use setup_timer
        phy: twl4030-usb: add ABI documentation
        phy: twl4030-usb: remove incorrect pm_runtime_get_sync() in probe function.
        phy: twl4030-usb: remove pointless 'suspended' test in 'suspend' callback.
        phy: twl4030-usb: make runtime pm more reliable.
        drivers:usb:fsl: Fix compilation error for fsl ehci drv
        usb: renesas_usbhs: Don't disable the pipe if Control write status stage
        ...
      2a298679
    • L
      Merge tag 'tty-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty · 8c7febe8
      Linus Torvalds 提交于
      Pull tty/serial driver updates from Greg KH:
       "Here's the tty and serial driver patches for 4.2-rc1.
      
        A number of individual driver updates, some code cleanups, and other
        minor things, full details in the shortlog.
      
        All have been in linux-next for a while with no reported issues"
      
      * tag 'tty-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (152 commits)
        Doc: serial-rs485.txt: update RS485 driver interface
        Doc: tty.txt: remove mention of the BKL
        MAINTAINERS: tty: add serial docs directory
        serial: sprd: check for NULL after calling devm_clk_get
        serial: 8250_pci: Correct uartclk for xr17v35x expansion chips
        serial: 8250_pci: Add support for 12 port Exar boards
        serial: 8250_uniphier: add bindings document for UniPhier UART
        serial: core: cleanup in uart_get_baud_rate()
        serial: stm32-usart: Add STM32 USART Driver
        tty/serial: kill off set_irq_flags usage
        tty: move linux/gsmmux.h to uapi
        doc: dt: add documentation for nxp,lpc1850-uart
        serial: 8250: add LPC18xx/43xx UART driver
        serial: 8250_uniphier: add UniPhier serial driver
        serial: 8250_dw: support ACPI platforms with integrated DMA engine
        serial: of_serial: check the return value of clk_prepare_enable()
        serial: of_serial: use devm_clk_get() instead of clk_get()
        serial: earlycon: Add support for big-endian MMIO accesses
        serial: sirf: use hrtimer for data rx
        serial: sirf: correct the fifo empty_bit
        ...
      8c7febe8
    • L
      Merge tag 'staging-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging · 23908db4
      Linus Torvalds 提交于
      Pull staging driver updates from Greg KH:
       "Here's the big, really big, staging tree patches for 4.2-rc1.
      
        Loads of stuff in here, almost all just coding style fixes / churn,
        and a few new drivers as well, one of which I just disabled from the
        build a few minutes ago due to way too many build warnings.
      
        Other than the one "disable this driver" patch, all of these have been
        in linux-next for quite a while with no reported issues"
      
      * tag 'staging-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (1163 commits)
        staging: wilc1000: disable driver due to build warnings
        Staging: rts5208: fix CHANGE_LINK_STATE value
        Staging: sm750fb: ddk750_swi2c.c: Insert spaces before parenthesis
        Staging: sm750fb: ddk750_swi2c.c: Place braces on correct lines
        Staging: sm750fb: ddk750_swi2c.c: Insert spaces around operators
        Staging: sm750fb: ddk750_swi2c.c: Replace spaces with tabs
        Staging: sm750fb: ddk750_swi2c.h: Shorten lines to under 80 characters
        Staging: sm750fb: ddk750_swi2c.h: Replace spaces with tabs
        Staging: sm750fb: modedb.h: Shorten lines to under 80 characters
        Staging: sm750fb: modedb.h: Replace spaces with tabs
        staging: comedi: addi_apci_3120: rename 'this_board' variables
        staging: comedi: addi_apci_1516: rename 'this_board' variables
        staging: comedi: ni_atmio: cleanup ni_getboardtype()
        staging: comedi: vmk80xx: sanity check context used to get the boardinfo
        staging: comedi: vmk80xx: rename 'boardinfo' variables
        staging: comedi: dt3000: rename 'this_board' variables
        staging: comedi: adv_pci_dio: rename 'this_board' variables
        staging: comedi: cb_pcidas64: rename 'thisboard' variables
        staging: comedi: cb_pcidas: rename 'thisboard' variables
        staging: comedi: me4000: rename 'thisboard' variables
        ...
      23908db4
    • L
      Merge tag 'driver-core-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core · 8d7804a2
      Linus Torvalds 提交于
      Pull driver core updates from Greg KH:
       "Here is the driver core / firmware changes for 4.2-rc1.
      
        A number of small changes all over the place in the driver core, and
        in the firmware subsystem.  Nothing really major, full details in the
        shortlog.  Some of it is a bit of churn, given that the platform
        driver probing changes was found to not work well, so they were
        reverted.
      
        All of these have been in linux-next for a while with no reported
        issues"
      
      * tag 'driver-core-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (31 commits)
        Revert "base/platform: Only insert MEM and IO resources"
        Revert "base/platform: Continue on insert_resource() error"
        Revert "of/platform: Use platform_device interface"
        Revert "base/platform: Remove code duplication"
        firmware: add missing kfree for work on async call
        fs: sysfs: don't pass count == 0 to bin file readers
        base:dd - Fix for typo in comment to function driver_deferred_probe_trigger().
        base/platform: Remove code duplication
        of/platform: Use platform_device interface
        base/platform: Continue on insert_resource() error
        base/platform: Only insert MEM and IO resources
        firmware: use const for remaining firmware names
        firmware: fix possible use after free on name on asynchronous request
        firmware: check for file truncation on direct firmware loading
        firmware: fix __getname() missing failure check
        drivers: of/base: move of_init to driver_init
        drivers/base: cacheinfo: fix annoying typo when DT nodes are absent
        sysfs: disambiguate between "error code" and "failure" in comments
        driver-core: fix build for !CONFIG_MODULES
        driver-core: make __device_attach() static
        ...
      8d7804a2
    • L
      Merge tag 'char-misc-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc · d8782381
      Linus Torvalds 提交于
      Pull char/misc driver updates from Greg KH:
       "Here's the big char/misc driver pull request for 4.2-rc1.
      
        Lots of mei, extcon, coresight, uio, mic, and other driver updates in
        here.  Full details in the shortlog.  All of these have been in
        linux-next for some time with no reported problems"
      
      * tag 'char-misc-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (176 commits)
        mei: me: wait for power gating exit confirmation
        mei: reset flow control on the last client disconnection
        MAINTAINERS: mei: add mei_cl_bus.h to maintained file list
        misc: sram: sort and clean up included headers
        misc: sram: move reserved block logic out of probe function
        misc: sram: add private struct device and virt_base members
        misc: sram: report correct SRAM pool size
        misc: sram: bump error message level on unclean driver unbinding
        misc: sram: fix device node reference leak on error
        misc: sram: fix enabled clock leak on error path
        misc: mic: Fix reported static checker warning
        misc: mic: Fix randconfig build error by including errno.h
        uio: pruss: Drop depends on ARCH_DAVINCI_DA850 from config
        uio: pruss: Add CONFIG_HAS_IOMEM dependence
        uio: pruss: Include <linux/sizes.h>
        extcon: Redefine the unique id of supported external connectors without 'enum extcon' type
        char:xilinx_hwicap:buffer_icap - change 1/0 to true/false for bool type variable in function buffer_icap_set_configuration().
        Drivers: hv: vmbus: Allocate ring buffer memory in NUMA aware fashion
        parport: check exclusive access before register
        w1: use correct lock on error in w1_seq_show()
        ...
      d8782381
    • L
      Merge tag 'trace-v4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace · e3826082
      Linus Torvalds 提交于
      Pull tracing updates from Steven Rostedt:
       "This patch series contains several clean ups and even a new trace
        clock "monitonic raw".  Also some enhancements to make the ring buffer
        even faster.  But the biggest and most noticeable change is the
        renaming of the ftrace* files, structures and variables that have to
        deal with trace events.
      
        Over the years I've had several developers tell me about their
        confusion with what ftrace is compared to events.  Technically,
        "ftrace" is the infrastructure to do the function hooks, which include
        tracing and also helps with live kernel patching.  But the trace
        events are a separate entity altogether, and the files that affect the
        trace events should not be named "ftrace".  These include:
      
          include/trace/ftrace.h         ->    include/trace/trace_events.h
          include/linux/ftrace_event.h   ->    include/linux/trace_events.h
      
        Also, functions that are specific for trace events have also been renamed:
      
          ftrace_print_*()               ->    trace_print_*()
          (un)register_ftrace_event()    ->    (un)register_trace_event()
          ftrace_event_name()            ->    trace_event_name()
          ftrace_trigger_soft_disabled() ->    trace_trigger_soft_disabled()
          ftrace_define_fields_##call()  ->    trace_define_fields_##call()
          ftrace_get_offsets_##call()    ->    trace_get_offsets_##call()
      
        Structures have been renamed:
      
          ftrace_event_file              ->    trace_event_file
          ftrace_event_{call,class}      ->    trace_event_{call,class}
          ftrace_event_buffer            ->    trace_event_buffer
          ftrace_subsystem_dir           ->    trace_subsystem_dir
          ftrace_event_raw_##call        ->    trace_event_raw_##call
          ftrace_event_data_offset_##call->    trace_event_data_offset_##call
          ftrace_event_type_funcs_##call ->    trace_event_type_funcs_##call
      
        And a few various variables and flags have also been updated.
      
        This has been sitting in linux-next for some time, and I have not
        heard a single complaint about this rename breaking anything.  Mostly
        because these functions, variables and structures are mostly internal
        to the tracing system and are seldom (if ever) used by anything
        external to that"
      
      * tag 'trace-v4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace: (33 commits)
        ring_buffer: Allow to exit the ring buffer benchmark immediately
        ring-buffer-benchmark: Fix the wrong type
        ring-buffer-benchmark: Fix the wrong param in module_param
        ring-buffer: Add enum names for the context levels
        ring-buffer: Remove useless unused tracing_off_permanent()
        ring-buffer: Give NMIs a chance to lock the reader_lock
        ring-buffer: Add trace_recursive checks to ring_buffer_write()
        ring-buffer: Allways do the trace_recursive checks
        ring-buffer: Move recursive check to per_cpu descriptor
        ring-buffer: Add unlikelys to make fast path the default
        tracing: Rename ftrace_get_offsets_##call() to trace_event_get_offsets_##call()
        tracing: Rename ftrace_define_fields_##call() to trace_event_define_fields_##call()
        tracing: Rename ftrace_event_type_funcs_##call to trace_event_type_funcs_##call
        tracing: Rename ftrace_data_offset_##call to trace_event_data_offset_##call
        tracing: Rename ftrace_raw_##call event structures to trace_event_raw_##call
        tracing: Rename ftrace_trigger_soft_disabled() to trace_trigger_soft_disabled()
        tracing: Rename FTRACE_EVENT_FL_* flags to EVENT_FILE_FL_*
        tracing: Rename struct ftrace_subsystem_dir to trace_subsystem_dir
        tracing: Rename ftrace_event_name() to trace_event_name()
        tracing: Rename FTRACE_MAX_EVENT to TRACE_EVENT_TYPE_MAX
        ...
      e3826082
    • L
      Merge tag 'trace-fixes-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace · fcbc1777
      Linus Torvalds 提交于
      Pull tracing fixes from Steven Rostedt:
       "This isn't my 4.2 pull request (yet).  I found a few more bugs that I
        would have sent to fix 4.1, but since 4.1 is already out, I'm sending
        this before sending my 4.2 request (which is ready to go).
      
        After fixing the previous filter issue reported by Vince Weaver, I
        could not come up with a situation where the operand counter (cnt)
        could go below zero, so I added a WARN_ON_ONCE(cnt < 0).  Vince was
        able to trigger that warn on with his fuzzer test, but didn't have a
        filter input that caused it.
      
        Later, Sasha Levin was able to trigger that same warning, and was able
        to give me the filter string that triggered it.  It was simply a
        single operation ">".
      
        I wrapped the filtering code in a userspace program such that I could
        single step through the logic.  With a single operator the operand
        counter can legitimately go below zero, and should be reported to the
        user as an error, but should not produce a kernel warning.  The
        WARN_ON_ONCE(cnt < 0) should be just a "if (cnt < 0) break;" and the
        code following it will produce the error message for the user.
      
        While debugging this, I found that there was another bug that let the
        pointer to the filter string go beyond the filter string.  This too
        was fixed.
      
        Finally, there was a typo in a stub function that only gets compiled
        if trace events is disabled but tracing is enabled (I'm not even sure
        that's possible)"
      
      * tag 'trace-fixes-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
        tracing: Fix typo from "static inlin" to "static inline"
        tracing/filter: Do not allow infix to exceed end of string
        tracing/filter: Do not WARN on operand count going below zero
      fcbc1777
    • L
      Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux · 099bfbfc
      Linus Torvalds 提交于
      Pull drm updates from Dave Airlie:
       "This is the main drm pull request for v4.2.
      
        I've one other new driver from freescale on my radar, it's been posted
        and reviewed, I'd just like to get someone to give it a last look, so
        maybe I'll send it or maybe I'll leave it.
      
        There is no major nouveau changes in here, Ben was working on
        something big, and we agreed it was a bit late, there wasn't anything
        else he considered urgent to merge.
      
        There might be another msm pull for some bits that are waiting on
        arm-soc, I'll see how we time it.
      
        This touches some "of" stuff, acks are in place except for the fixes
        to the build in various configs,t hat I just applied.
      
        Summary:
      
        New drivers:
            - virtio-gpu:
                      KMS only pieces of driver for virtio-gpu in qemu.
                      This is just the first part of this driver, enough to run
                      unaccelerated userspace on. As qemu merges more we'll start
                      adding the 3D features for the virgl 3d work.
            - amdgpu:
                      a new driver from AMD to driver their newer GPUs. (VI+)
                      It contains a new cleaner userspace API, and is a clean
                      break from radeon moving forward, that AMD are going to
                      concentrate on. It also contains a set of register headers
                      auto generated from AMD internal database.
      
        core:
            - atomic modesetting API completed, enabled by default now.
            - Add support for mode_id blob to atomic ioctl to complete interface.
            - bunch of Displayport MST fixes
            - lots of misc fixes.
      
        panel:
            - new simple panels
            - fix some long-standing build issues with bridge drivers
      
        radeon:
            - VCE1 support
            - add a GPU reset counter for userspace
            - lots of fixes.
      
        amdkfd:
            - H/W debugger support module
            - static user-mode queues
            - support killing all the waves when a process terminates
            - use standard DECLARE_BITMAP
      
        i915:
            - Add Broxton support
            - S3, rotation support for Skylake
            - RPS booting tuning
            - CPT modeset sequence fixes
            - ns2501 dither support
            - enable cmd parser on haswell
            - cdclk handling fixes
            - gen8 dynamic pte allocation
            - lots of atomic conversion work
      
        exynos:
            - Add atomic modesetting support
            - Add iommu support
            - Consolidate drm driver initialization
            - and MIC, DECON and MIPI-DSI support for exynos5433
      
        omapdrm:
            - atomic modesetting support (fixes lots of things in rewrite)
      
        tegra:
            - DP aux transaction fixes
            - iommu support fix
      
        msm:
            - adreno a306 support
            - various dsi bits
            - various 64-bit fixes
            - NV12MT support
      
        rcar-du:
            - atomic and misc fixes
      
        sti:
            - fix HDMI timing complaince
      
        tilcdc:
            - use drm component API to access tda998x driver
            - fix module unloading
      
        qxl:
            - stability fixes"
      
      * 'drm-next' of git://people.freedesktop.org/~airlied/linux: (872 commits)
        drm/nouveau: Pause between setting gpu to D3hot and cutting the power
        drm/dp/mst: close deadlock in connector destruction.
        drm: Always enable atomic API
        drm/vgem: Set unique to "vgem"
        of: fix a build error to of_graph_get_endpoint_by_regs function
        drm/dp/mst: take lock around looking up the branch device on hpd irq
        drm/dp/mst: make sure mst_primary mstb is valid in work function
        of: add EXPORT_SYMBOL for of_graph_get_endpoint_by_regs
        ARM: dts: rename the clock of MIPI DSI 'pll_clk' to 'sclk_mipi'
        drm/atomic: Don't set crtc_state->enable manually
        drm/exynos: dsi: do not set TE GPIO direction by input
        drm/exynos: dsi: add support for MIC driver as a bridge
        drm/exynos: dsi: add support for Exynos5433
        drm/exynos: dsi: make use of array for clock access
        drm/exynos: dsi: make use of driver data for static values
        drm/exynos: dsi: add macros for register access
        drm/exynos: dsi: rename pll_clk to sclk_clk
        drm/exynos: mic: add MIC driver
        of: add helper for getting endpoint node of specific identifiers
        drm/exynos: add Exynos5433 decon driver
        ...
      099bfbfc
    • L
      Merge tag 'dm-4.2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm · 22165fa7
      Linus Torvalds 提交于
      Pull device mapper fixes from Mike Snitzer:
       "Apologies for not pressing this request-based DM partial completion
        issue further, it was an oversight on my part.  We'll have to get it
        fixed up properly and revisit for a future release.
      
         - Revert block and DM core changes the removed request-based DM's
           ability to handle partial request completions -- otherwise with the
           current SCSI LLDs these changes could lead to silent data
           corruption.
      
         - Fix two DM version bumps that were missing from the initial 4.2 DM
           pull request (enabled userspace lvm2 to know certain changes have
           been made)"
      
      * tag 'dm-4.2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm:
        dm cache policy smq: fix "default" version to be 1.4.0
        dm: bump the ioctl version to 4.32.0
        Revert "block, dm: don't copy bios for request clones"
        Revert "dm: do not allocate any mempools for blk-mq request-based DM"
      22165fa7
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 · a2f54be9
      Linus Torvalds 提交于
      Pull crypto fixes from Herbert Xu:
       "This fixes the following issues:
      
         - move -O0 jitterentropy code into its own file instead of using gcc
           pragma magic.
      
         - kill testmgr warning for gcm-aes-aesni.
      
         - fix build failure in old rsa.
      
        Other minor fixes:
      
         - ignore asn1 files generated by new rsa.
      
         - remove unnecessary kzfree NULL checks in jitterentropy.
      
         - typo fix in akcipher"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
        crypto: rsa - add .gitignore for crypto/*.-asn1.[ch] files
        crypto: asymmetric_keys/rsa - Use non-conflicting variable name
        crypto: testmgr - don't print info about missing test for gcm-aes-aesni
        crypto: jitterentropy - Delete unnecessary checks before the function call "kzfree"
        crypto: akcipher - fix spelling cihper -> cipher
        crypto: jitterentropy - avoid compiler warnings
      a2f54be9
    • L
      Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm · e8a0b37d
      Linus Torvalds 提交于
      Pull ARM updates from Russell King:
       "Bigger items included in this update are:
      
         - A series of updates from Arnd for ARM randconfig build failures
         - Updates from Dmitry for StrongARM SA-1100 to move IRQ handling to
           drivers/irqchip/
         - Move ARMs SP804 timer to drivers/clocksource/
         - Perf updates from Mark Rutland in preparation to move the ARM perf
           code into drivers/ so it can be shared with ARM64.
         - MCPM updates from Nicolas
         - Add support for taking platform serial number from DT
         - Re-implement Keystone2 physical address space switch to conform to
           architecture requirements
         - Clean up ARMv7 LPAE code, which goes in hand with the Keystone2
           changes.
         - L2C cleanups to avoid unlocking caches if we're prevented by the
           secure support to unlock.
         - Avoid cleaning a potentially dirty cache containing stale data on
           CPU initialisation
         - Add ARM-only entry point for secondary startup (for machines that
           can only call into a Thumb kernel in ARM mode).  Same thing is also
           done for the resume entry point.
         - Provide arch_irqs_disabled via asm-generic
         - Enlarge ARMv7M vector table
         - Always use BFD linker for VDSO, as gold doesn't accept some of the
           options we need.
         - Fix an incorrect BSYM (for Thumb symbols) usage, and convert all
           BSYM compiler macros to a "badr" (for branch address).
         - Shut up compiler warnings provoked by our cmpxchg() implementation.
         - Ensure bad xchg sizes fail to link"
      
      * 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm: (75 commits)
        ARM: Fix build if CLKDEV_LOOKUP is not configured
        ARM: fix new BSYM() usage introduced via for-arm-soc branch
        ARM: 8383/1: nommu: avoid deprecated source register on mov
        ARM: 8391/1: l2c: add options to overwrite prefetching behavior
        ARM: 8390/1: irqflags: Get arch_irqs_disabled from asm-generic
        ARM: 8387/1: arm/mm/dma-mapping.c: Add arm_coherent_dma_mmap
        ARM: 8388/1: tcm: Don't crash when TCM banks are protected by TrustZone
        ARM: 8384/1: VDSO: force use of BFD linker
        ARM: 8385/1: VDSO: group link options
        ARM: cmpxchg: avoid warnings from macro-ized cmpxchg() implementations
        ARM: remove __bad_xchg definition
        ARM: 8369/1: ARMv7M: define size of vector table for Vybrid
        ARM: 8382/1: clocksource: make ARM_TIMER_SP804 depend on GENERIC_SCHED_CLOCK
        ARM: 8366/1: move Dual-Timer SP804 driver to drivers/clocksource
        ARM: 8365/1: introduce sp804_timer_disable and remove arm_timer.h inclusion
        ARM: 8364/1: fix BE32 module loading
        ARM: 8360/1: add secondary_startup_arm prototype in header file
        ARM: 8359/1: correct secondary_startup_arm mode
        ARM: proc-v7: sanitise and document registers around errata
        ARM: proc-v7: clean up MIDR access
        ...
      e8a0b37d
    • L
      Merge tag 'armsoc-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · abea9629
      Linus Torvalds 提交于
      Pull ARM SoC defconfig updates from Kevin Hilman:
       "We keep collecting defconfig updates in a separate branch mostly to
        encourage people to handle them separately and avoid conflicts between
        different topics.
      
        Most of these are enablement of new SoCs, boards or drivers that have
        come in, or minor config refreshes due to reorderings in Kconfig
        files, etc.  I.e. mostly minor churn of various kinds"
      
      * tag 'armsoc-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (55 commits)
        ARM: multi_v7_defconfig: remove duplicate CONFIG_COMMON_CLK_QCOM=y
        ARM: multi_v7_defconfig: Enable display on Trats2 board
        ARM64: add GPIO keys to the defconfig
        ARM: keystone: defconfig: enable netcp driver by default
        ARM: exynos_defconfig: Enable CONFIG_SENSORS_INA2XX for Odroid-XU3
        ARM: exynos_defconfig: Enable CONFIG_SENSORS_PWM_FAN for Odroid-XU3
        ARM: omap2plus_defconfig: Enable TOUCHSCREEN_PIXCIR
        ARM: omap2plus_defconfig: Add dm816x USB PHY as a loadable module
        ARM: omap2plus_defconifg: Enable DM9000 in omap2plus_defconfig
        ARM: lpc18xx: remove DEBUG_LL_UART_8250 from defconfig
        ARM: multi_v7_defconfig: Make media support modular
        ARM: multi_v7_defconfig: Make sound support modular
        ARM: multi_v7_defconfig: Enable shmobile r8a7778/bockw platform
        ARM: exynos_defconfig: savedefconfig
        ARM: exynos_defconfig: Enable display on Trats2 board
        ARM: multi_v7_defconfig: Enable OHCI on exynos SoCs
        ARM: multi_v7_defconfig: Enable TMU for exynos SoCs
        ARM: multi_v7_defconfig: Enable PMIC and MUIC drivers for exynos
        ARM: multi_v7_defconfig: Enable CPU idle for exynos SoCs
        ARM: multi_v7_defconfig: Enable Cypress APA I2C Trackpad support
        ...
      abea9629
    • G
      staging: wilc1000: disable driver due to build warnings · 53a20e9e
      Greg Kroah-Hartman 提交于
      The wilc1000 has just too many build warnings to be able to enable it
      for the 4.2 release.  Given that there have not been any patches
      submitted to properly fix these obvious errors, I'm going to disable it
      for now.  I will enable it back when the build warning fixes are
      submitted, or, if that never happens, I will remove it from the tree.
      
      Cc: Johnny Kim <johnny.kim@atmel.com>
      Cc: Rachel Kim <rachel.kim@atmel.com>
      Cc: Dean Lee <dean.lee@atmel.com>
      Cc: Chris Park <chris.park@atmel.com>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      53a20e9e