1. 24 May, 2016 6 commits
    • Linus Torvalds's avatar
      Merge tag 'linux-kselftest-4.7-rc1' of... · d62a0234
      Linus Torvalds authored
      Merge tag 'linux-kselftest-4.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest
      
      Pull kselftest updates from Shuah Khan:
       "This update for Kselftest adds:
      
         - a new ftrace testcase
         - fixes for ftrace and intel_pstate tests"
      
      * tag 'linux-kselftest-4.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
        tools: testing: define the _GNU_SOURCE macro
        kselftests/ftrace: Add a test case for event pid filtering
        kselftests/ftrace: Detect tracefs mount point
      d62a0234
    • Linus Torvalds's avatar
      Merge tag 'trace-v4.7-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace · 4496a1d9
      Linus Torvalds authored
      Pull tracing fix from Steven Rostedt:
       "Reviewing the selftest I recently submitted, I realize that the second
        part of it uses my old hack to get the PID of the spawned background
        tasks, which doesn't work for all shells, instead of the common use of
        $!"
      
      * tag 'trace-v4.7-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
        ftracetest: Use proper logic to find process PID
      4496a1d9
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile · d6542d76
      Linus Torvalds authored
      Pull arch/tile updates from Chris Metcalf:
       "This is an even quieter cycle than usual"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
        Fix typo
        Fix typo
        Fix typo
        tile: sort the "select" lines in the TILE/TILEGX configs
        tile: clarify barrier semantics of atomic_add_return
        tile/defconfigs: Remove CONFIG_IPV6_PRIVACY
      d6542d76
    • Linus Torvalds's avatar
      Merge branch 'for-4.7-dw' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata · 3ec438af
      Linus Torvalds authored
      Pull libata sata_dwc_460ex updates from Tejun Heo:
       "Patches to bring sata_dwc_460ex up to snuff.
      
        It was a separate pull request because it depends on dmaengine dw
        platform changes which are now in mainline"
      
      * 'for-4.7-dw' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata: (24 commits)
        ata: dwc: add DMADEVICES dependency
        powerpc/4xx: Device tree update for the 460ex DWC SATA
        ata: sata_dwc_460ex: make debug messages neat
        ata: sata_dwc_460ex: supply physical address of FIFO to DMA
        ata: sata_dwc_460ex: use devm_ioremap
        ata: sata_dwc_460ex: tidy up sata_dwc_clear_dmacr()
        ata: sata_dwc_460ex: use readl/writel_relaxed()
        ata: sata_dwc_460ex: switch to new dmaengine_terminate_* API
        ata: sata_dwc_460ex: add __iomem to register base pointer
        ata: sata_dwc_460ex: get rid of incorrect cast
        ata: sata_dwc_460ex: get rid of some pointless casts
        ata: sata_dwc_460ex: remove empty libata callback
        ata: sata_dwc_460ex: correct HOSTDEV{P}_FROM_*() macros
        ata: sata_dwc_460ex: get rid of global data
        ata: sata_dwc_460ex: add phy support
        ata: sata_dwc_460ex: use "dmas" DT property to find dma channel
        ata: sata_dwc_460ex: don't call ata_sff_qc_issue() on DMA commands
        ata: sata_dwc_460ex: skip dma setup for non-dma commands
        ata: sata_dwc_460ex: select only core part of DMA driver
        ata: sata_dwc_460ex: DMA is always a flow controller
        ...
      3ec438af
    • Linus Torvalds's avatar
      Merge branch 'for-4.7-zac' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata · e4f7bdc2
      Linus Torvalds authored
      Pull libata ZAC support from Tejun Heo:
       "This contains Zone ATA Command support for Shingled Magnetic Recording
        devices.
      
        In addition to sending the new commands down to the device, as ZAC
        commands depend on getting a lot of responses from the device, piping
        up responses is beefed up too.  However, it doesn't involve changes to
        libata core mechanism or its interaction with upper layers, so I'm not
        expecting too many fallouts.
      
        Kudos to Hannes for driving SMR support"
      
      * 'for-4.7-zac' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata: (28 commits)
        libata: support host-aware and host-managed ZAC devices
        libata: support device-managed ZAC devices
        libata: NCQ encapsulation for ZAC MANAGEMENT OUT
        libata: Implement ZBC OUT translation
        libata: implement ZBC IN translation
        libata: fixup ZAC device disabling
        libata-scsi: Generate sense code for disabled devices
        libata-trace: decode subcommands
        libata: Check log page directory before accessing pages
        libata: Add command definitions for NCQ Encapsulation for READ LOG DMA EXT
        libata: Separate out ata_dev_config_ncq_send_recv()
        libata/libsas: Define ATA_CMD_NCQ_NON_DATA
        libsas: enable FPDMA SEND/RECEIVE
        libata: do not attempt to retrieve sense code twice
        libata-scsi: Set information sense field for invalid parameter
        libata-scsi: set bit pointer for sense code information
        libata-scsi: Set field pointer in sense code
        scsi: add scsi_set_sense_field_pointer()
        libata: Implement control mode page to select sense format
        libata-scsi: generate correct ATA pass-through sense
        ...
      e4f7bdc2
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security · 3159ee58
      Linus Torvalds authored
      Pull more security subsystem updates from James Morris:
       "Minor updates for the keys code"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
        MAINTAINERS: Update keyrings record and add asymmetric keys record
        lib: asn1_decoder - add MODULE_LICENSE("GPL")
        KEYS: The PKCS#7 test key type should use the secondary keyring
      3159ee58
  2. 23 May, 2016 15 commits
    • Linus Torvalds's avatar
      Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux · 1d6da87a
      Linus Torvalds authored
      Pull drm updates from Dave Airlie:
       "Here's the main drm pull request for 4.7, it's been a busy one, and
        I've been a bit more distracted in real life this merge window.  Lots
        more ARM drivers, not sure if it'll ever end.  I think I've at least
        one more coming the next merge window.
      
        But changes are all over the place, support for AMD Polaris GPUs is in
        here, some missing GM108 support for nouveau (found in some Lenovos),
        a bunch of MST and skylake fixes.
      
        I've also noticed a few fixes from Arnd in my inbox, that I'll try and
        get in asap, but I didn't think they should hold this up.
      
        New drivers:
         - Hisilicon kirin display driver
         - Mediatek MT8173 display driver
         - ARC PGU - bitstreamer on Synopsys ARC SDP boards
         - Allwinner A13 initial RGB output driver
         - Analogix driver for DisplayPort IP found in exynos and rockchip
      
        DRM Core:
         - UAPI headers fixes and C++ safety
         - DRM connector reference counting
         - DisplayID mode parsing for Dell 5K monitors
         - Removal of struct_mutex from drivers
         - Connector registration cleanups
         - MST robustness fixes
         - MAINTAINERS updates
         - Lockless GEM object freeing
         - Generic fbdev deferred IO support
      
        panel:
         - Support for a bunch of new panels
      
        i915:
         - VBT refactoring
         - PLL computation cleanups
         - DSI support for BXT
         - Color manager support
         - More atomic patches
         - GEM improvements
         - GuC fw loading fixes
         - DP detection fixes
         - SKL GPU hang fixes
         - Lots of BXT fixes
      
        radeon/amdgpu:
         - Initial Polaris support
         - GPUVM/Scheduler/Clock/Power improvements
         - ASYNC pageflip support
         - New mesa feature support
      
        nouveau:
         - GM108 support
         - Power sensor support improvements
         - GR init + ucode fixes.
         - Use GPU provided topology information
      
        vmwgfx:
         - Add host messaging support
      
        gma500:
         - Some cleanups and fixes
      
        atmel:
         - Bridge support
         - Async atomic commit support
      
        fsl-dcu:
         - Timing controller for LCD support
         - Pixel clock polarity support
      
        rcar-du:
         - Misc fixes
      
        exynos:
         - Pipeline clock support
         - Exynoss4533 SoC support
         - HW trigger mode support
         - export HDMI_PHY clock
         - DECON5433 fixes
         - Use generic prime functions
         - use DMA mapping APIs
      
        rockchip:
         - Lots of little fixes
      
        vc4:
         - Render node support
         - Gamma ramp support
         - DPI output support
      
        msm:
         - Mostly cleanups and fixes
         - Conversion to generic struct fence
      
        etnaviv:
         - Fix for prime buffer handling
         - Allow hangcheck to be coalesced with other wakeups
      
        tegra:
         - Gamme table size fix"
      
      * 'drm-next' of git://people.freedesktop.org/~airlied/linux: (1050 commits)
        drm/edid: add displayid detailed 1 timings to the modelist. (v1.1)
        drm/edid: move displayid validation to it's own function.
        drm/displayid: Iterate over all DisplayID blocks
        drm/edid: move displayid tiled block parsing into separate function.
        drm: Nuke ->vblank_disable_allowed
        drm/vmwgfx: Report vmwgfx version to vmware.log
        drm/vmwgfx: Add VMWare host messaging capability
        drm/vmwgfx: Kill some lockdep warnings
        drm/nouveau/gr/gf100-: fix race condition in fecs/gpccs ucode
        drm/nouveau/core: recognise GM108 chipsets
        drm/nouveau/gr/gm107-: fix touching non-existent ppcs in attrib cb setup
        drm/nouveau/gr/gk104-: share implementation of ppc exception init
        drm/nouveau/gr/gk104-: move rop_active_fbps init to nonctx
        drm/nouveau/bios/pll: check BIT table version before trying to parse it
        drm/nouveau/bios/pll: prevent oops when limits table can't be parsed
        drm/nouveau/volt/gk104: round up in gk104_volt_set
        drm/nouveau/fb/gm200: setup mmu debug buffer registers at init()
        drm/nouveau/fb/gk20a,gm20b: setup mmu debug buffer registers at init()
        drm/nouveau/fb/gf100-: allocate mmu debug buffers
        drm/nouveau/fb: allow chipset-specific actions for oneinit()
        ...
      1d6da87a
    • Linus Torvalds's avatar
      Merge tag 'libnvdimm-for-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm · 1f40c495
      Linus Torvalds authored
      Pull libnvdimm updates from Dan Williams:
       "The bulk of this update was stabilized before the merge window and
        appeared in -next.  The "device dax" implementation was revised this
        week in response to review feedback, and to address failures detected
        by the recently expanded ndctl unit test suite.
      
        Not included in this pull request are two dax topic branches (dax
        error handling, and dax radix-tree locking).  These topics were
        deferred to get a few more days of -next integration testing, and to
        coordinate a branch baseline with Ted and the ext4 tree.  Vishal and
        Ross will send the error handling and locking topics respectively in
        the next few days.
      
        This branch has received a positive build result from the kbuild robot
        across 226 configs.
      
        Summary:
      
         - Device DAX for persistent memory: Device DAX is the device-centric
           analogue of Filesystem DAX (CONFIG_FS_DAX).  It allows memory
           ranges to be allocated and mapped without need of an intervening
           file system.  Device DAX is strict, precise and predictable.
           Specifically this interface:
      
            a) Guarantees fault granularity with respect to a given page size
               (pte, pmd, or pud) set at configuration time.
      
            b) Enforces deterministic behavior by being strict about what
               fault scenarios are supported.
      
           Persistent memory is the first target, but the mechanism is also
           targeted for exclusive allocations of performance/feature
           differentiated memory ranges.
      
         - Support for the HPE DSM (device specific method) command formats.
           This enables management of these first generation devices until a
           unified DSM specification materializes.
      
         - Further ACPI 6.1 compliance with support for the common dimm
           identifier format.
      
         - Various fixes and cleanups across the subsystem"
      
      * tag 'libnvdimm-for-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm: (40 commits)
        libnvdimm, dax: fix deletion
        libnvdimm, dax: fix alignment validation
        libnvdimm, dax: autodetect support
        libnvdimm: release ida resources
        Revert "block: enable dax for raw block devices"
        /dev/dax, core: file operations and dax-mmap
        /dev/dax, pmem: direct access to persistent memory
        libnvdimm: stop requiring a driver ->remove() method
        libnvdimm, dax: record the specified alignment of a dax-device instance
        libnvdimm, dax: reserve space to store labels for device-dax
        libnvdimm, dax: introduce device-dax infrastructure
        nfit: add sysfs dimm 'family' and 'dsm_mask' attributes
        tools/testing/nvdimm: ND_CMD_CALL support
        nfit: disable vendor specific commands
        nfit: export subsystem ids as attributes
        nfit: fix format interface code byte order per ACPI6.1
        nfit, libnvdimm: limited/whitelisted dimm command marshaling mechanism
        nfit, libnvdimm: clarify "commands" vs "_DSMs"
        libnvdimm: increase max envelope size for ioctl
        acpi/nfit: Add sysfs "id" for NVDIMM ID
        ...
      1f40c495
    • Andrea Gelmini's avatar
      Fix typo · bdf03e59
      Andrea Gelmini authored
      Signed-off-by: default avatarAndrea Gelmini <andrea.gelmini@gelma.net>
      Signed-off-by: default avatarChris Metcalf <cmetcalf@mellanox.com>
      bdf03e59
    • Andrea Gelmini's avatar
      Fix typo · 94ceaf38
      Andrea Gelmini authored
      Signed-off-by: default avatarAndrea Gelmini <andrea.gelmini@gelma.net>
      Signed-off-by: default avatarChris Metcalf <cmetcalf@mellanox.com>
      94ceaf38
    • Andrea Gelmini's avatar
      Fix typo · a87e2cdc
      Andrea Gelmini authored
      Signed-off-by: default avatarAndrea Gelmini <andrea.gelmini@gelma.net>
      Signed-off-by: default avatarChris Metcalf <cmetcalf@mellanox.com>
      a87e2cdc
    • Steven Rostedt (Red Hat)'s avatar
      ftracetest: Use proper logic to find process PID · 97f8827a
      Steven Rostedt (Red Hat) authored
      Half of the test in instance-event.tc was updated to use $! to find the PID
      of the previous background process that was launched, but the second part of
      the test still used the parsing of "jobs", which does not work on all shells
      like $! does.
      Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
      97f8827a
    • James Morris's avatar
      Merge tag 'keys-next-20160511' of... · 653bd456
      James Morris authored
      Merge tag 'keys-next-20160511' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into for-linus
      653bd456
    • Linus Torvalds's avatar
      Merge tag 'trace-v4.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace · 7639dad9
      Linus Torvalds authored
      Pull motr tracing updates from Steven Rostedt:
       "Three more changes.
      
         - I forgot that I had another selftest to stress test the ftrace
           instance creation.  It was actually suppose to go into the 4.6
           merge window, but I never committed it.  I almost forgot about it
           again, but noticed it was missing from your tree.
      
         - Soumya PN sent me a clean up patch to not disable interrupts when
           taking the tasklist_lock for read, as it's unnecessary because that
           lock is never taken for write in irq context.
      
         - Newer gcc's can cause the jump in the function_graph code to the
           global ftrace_stub label to be a short jump instead of a long one.
           As that jump is dynamically converted to jump to the trace code to
           do function graph tracing, and that conversion expects a long jump
           it can corrupt the ftrace_stub itself (it's directly after that
           call).  One way to prevent gcc from using a short jump is to
           declare the ftrace_stub as a weak function, which we do here to
           keep gcc from optimizing too much"
      
      * tag 'trace-v4.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
        ftrace/x86: Set ftrace_stub to weak to prevent gcc from using short jumps to it
        ftrace: Don't disable irqs when taking the tasklist_lock read_lock
        ftracetest: Add instance created, delete, read and enable event test
      7639dad9
    • Linus Torvalds's avatar
      Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu · 77ed402b
      Linus Torvalds authored
      Pull m68knommu update from Greg Ungerer:
       "Only a single change to update my email address in the MAINTAINERS
        file"
      
      * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
        m68k: change m68knommu maintainer email address
      77ed402b
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc · 21f9debf
      Linus Torvalds authored
      Pull sparc updates from David Miller:
       "Some 32-bit kgdb cleanups from Sam Ravnborg, and a hugepage TLB flush
        overhead fix on 64-bit from Nitin Gupta"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
        sparc64: Reduce TLB flushes during hugepte changes
        aeroflex/greth: fix warning about unused variable
        openprom: fix warning
        sparc32: drop superfluous cast in calls to __nocache_pa()
        sparc32: fix build with STRICT_MM_TYPECHECKS
        sparc32: use proper prototype for trapbase
        sparc32: drop local prototype in kgdb_32
        sparc32: drop hardcoding trap_level in kgdb_trap
      21f9debf
    • Dave Airlie's avatar
      drm/edid: add displayid detailed 1 timings to the modelist. (v1.1) · a39ed680
      Dave Airlie authored
      The tiled 5K Dell monitor appears to be hiding it's tiled mode
      inside the displayid timings block, this patch parses this
      blocks and adds the modes to the modelist.
      
      v1.1: add missing __packed.
      
      Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=95207Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      a39ed680
    • Dave Airlie's avatar
      drm/edid: move displayid validation to it's own function. · c9729177
      Dave Airlie authored
      We need to use this for validating modeline additions.
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      c9729177
    • Tomas Bzatek's avatar
      drm/displayid: Iterate over all DisplayID blocks · 3a4a2ea3
      Tomas Bzatek authored
      This will iterate over all DisplayID blocks found in the buffer.
      Previously only the first block was parsed.
      
      https://bugs.freedesktop.org/show_bug.cgi?id=95207Signed-off-by: default avatarTomas Bzatek <tomas@bzatek.net>
      Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      3a4a2ea3
    • Dave Airlie's avatar
      drm/edid: move displayid tiled block parsing into separate function. · 5e546cd5
      Dave Airlie authored
      This just makes the code easier to follow.
      Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      5e546cd5
    • Linus Torvalds's avatar
      x86: remove more uaccess_32.h complexity · bd28b145
      Linus Torvalds authored
      I'm looking at trying to possibly merge the 32-bit and 64-bit versions
      of the x86 uaccess.h implementation, but first this needs to be cleaned
      up.
      
      For example, the 32-bit version of "__copy_from_user_inatomic()" is
      mostly the special cases for the constant size, and it's actually almost
      never relevant.  Most users aren't actually using a constant size
      anyway, and the few cases that do small constant copies are better off
      just using __get_user() instead.
      
      So get rid of the unnecessary complexity.
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      bd28b145
  3. 22 May, 2016 2 commits
    • Linus Torvalds's avatar
      x86: remove pointless uaccess_32.h complexity · 5b09c3ed
      Linus Torvalds authored
      I'm looking at trying to possibly merge the 32-bit and 64-bit versions
      of the x86 uaccess.h implementation, but first this needs to be cleaned
      up.
      
      For example, the 32-bit version of "__copy_to_user_inatomic()" is mostly
      the special cases for the constant size, and it's actually never
      relevant.  Every user except for one aren't actually using a constant
      size anyway, and the one user that uses it is better off just using
      __put_user() instead.
      
      So get rid of the unnecessary complexity.
      
      [ The same cleanup should likely happen to __copy_from_user_inatomic()
        as well, but that one has a lot more users that I need to take a look
        at first ]
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      5b09c3ed
    • Linus Torvalds's avatar
      Merge tag 'for-f2fs-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs · f6c658df
      Linus Torvalds authored
      Pull f2fs updates from Jaegeuk Kim:
       "In this round, as Ted pointed out, fscrypto allows one more key prefix
        given by filesystem to resolve backward compatibility issues.  Other
        than that, we've fixed several error handling cases by introducing
        a fault injection facility.  We've also achieved performance
        improvement in some workloads as well as a bunch of bug fixes.
      
        Summary:
      
        Enhancements:
         - fs-specific prefix for fscrypto
         - fault injection facility
         - expose validity bitmaps for user to be aware of fragmentation
         - fallocate/rm/preallocation speed up
         - use percpu counters
      
        Bug fixes:
         - some inline_dentry/inline_data bugs
         - error handling for atomic/volatile/orphan inodes
         - recover broken superblock"
      
      * tag 'for-f2fs-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs: (73 commits)
        f2fs: fix to update dirty page count correctly
        f2fs: flush pending bios right away when error occurs
        f2fs: avoid ENOSPC fault in the recovery process
        f2fs: make exit_f2fs_fs more clear
        f2fs: use percpu_counter for total_valid_inode_count
        f2fs: use percpu_counter for alloc_valid_block_count
        f2fs: use percpu_counter for # of dirty pages in inode
        f2fs: use percpu_counter for page counters
        f2fs: use bio count instead of F2FS_WRITEBACK page count
        f2fs: manipulate dirty file inodes when DATA_FLUSH is set
        f2fs: add fault injection to sysfs
        f2fs: no need inc dirty pages under inode lock
        f2fs: fix incorrect error path handling in f2fs_move_rehashed_dirents
        f2fs: fix i_current_depth during inline dentry conversion
        f2fs: correct return value type of f2fs_fill_super
        f2fs: fix deadlock when flush inline data
        f2fs: avoid f2fs_bug_on during recovery
        f2fs: show # of orphan inodes
        f2fs: support in batch fzero in dnode page
        f2fs: support in batch multi blocks preallocation
        ...
      f6c658df
  4. 21 May, 2016 17 commits