1. 01 Jul, 2015 28 commits
  2. 29 Jun, 2015 6 commits
    • Linus Torvalds's avatar
      Merge tag 'md/4.2' of git://neil.brown.name/md · 6aaf0da8
      Linus Torvalds authored
      Pull md updates from Neil Brown:
       "A mixed bag
      
         - a few bug fixes
         - some performance improvement that decrease lock contention
         - some clean-up
      
        Nothing major"
      
      * tag 'md/4.2' of git://neil.brown.name/md:
        md: clear Blocked flag on failed devices when array is read-only.
        md: unlock mddev_lock on an error path.
        md: clear mddev->private when it has been freed.
        md: fix a build warning
        md/raid5: ignore released_stripes check
        md/raid5: per hash value and exclusive wait_for_stripe
        md/raid5: split wait_for_stripe and introduce wait_for_quiescent
        wait: introduce wait_event_exclusive_cmd
        md: convert to kstrto*()
        md/raid10: make sync_request_write() call bio_copy_data()
      6aaf0da8
    • Christoph Lameter's avatar
      Fix kmalloc slab creation sequence · a9730fca
      Christoph Lameter authored
      This patch restores the slab creation sequence that was broken by commit
      4066c33d and also reverts the portions that introduced the
      KMALLOC_LOOP_XXX macros. Those can never really work since the slab creation
      is much more complex than just going from a minimum to a maximum number.
      
      The latest upstream kernel boots cleanly on my machine with a 64 bit x86
      configuration under KVM using either SLAB or SLUB.
      
      Fixes: 4066c33d ("support the slub_debug boot option")
      Reported-by: default avatarTheodore Ts'o <tytso@mit.edu>
      Signed-off-by: default avatarChristoph Lameter <cl@linux.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      a9730fca
    • Linus Torvalds's avatar
      Merge tag 'libnvdimm-for-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/nvdimm · 88793e5c
      Linus Torvalds authored
      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
    • Linus Torvalds's avatar
      Merge tag 'dmaengine-4.2-rc1' of git://git.infradead.org/users/vkoul/slave-dma · 1bc5e157
      Linus Torvalds authored
      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
    • Linus Torvalds's avatar
      Merge tag 'please-pull-misc-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux · f199b663
      Linus Torvalds authored
      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
    • Linus Torvalds's avatar
      Merge tag 'linux-kselftest-4.2-rc1' of... · d93a74a9
      Linus Torvalds authored
      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
  3. 28 Jun, 2015 3 commits
    • Linus Torvalds's avatar
      Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu · c63f887b
      Linus Torvalds authored
      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
    • Linus Torvalds's avatar
      Merge branch 'for-linus-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml · 21dc2e6c
      Linus Torvalds authored
      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
    • Linus Torvalds's avatar
      Merge tag 'vfio-v4.2-rc1' of git://github.com/awilliam/linux-vfio · b779157d
      Linus Torvalds authored
      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
  4. 27 Jun, 2015 3 commits
    • Linus Torvalds's avatar
      Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/audit · 4a10a917
      Linus Torvalds authored
      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
    • Linus Torvalds's avatar
      Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security · e22619a2
      Linus Torvalds authored
      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
    • Linus Torvalds's avatar
      Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus · 78c10e55
      Linus Torvalds authored
      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