1. 22 Mar, 2016 27 commits
  2. 21 Mar, 2016 13 commits
    • Linus Torvalds's avatar
      Merge tag 'mmc-v4.6' of git://git.linaro.org/people/ulf.hansson/mmc · e531cdf5
      Linus Torvalds authored
      Pull MMC updates from Ulf Hansson:
       "MMC core:
            - Fix ABI regression of MMC BLK ioctl
            - Remove the unused MMC_DATA_STREAM flag
            - Enable asynchronous system PM for the host device
            - Minor fixes and clean-ups
      
        SDHCI host:
           Throughout the years, the numbers of SDHCI variants have increased
           and so has also the numbers of SDHCI callbacks/quirks.  The purpose
           of these callbacks/quirks were to enable SDHCI to deal with variant
           specific requirements, but unfortunate this method didn't scale.
           Instead we have ended up with a mess.  Not only did the code become
           suboptimal but also highly fragile.
      
           Lately many discussions of how to move forward with SDHCI has taken
           place at the MMC mailing list.  Step by step, we aim to turn
           SDHCI's common code into a set of library functions.  This will
           enable for optimizations and allow some of the existing callbacks
           and quirks to be removed, which also should help to make the code
           less fragile.
      
           Therefore I am also really pleased to announce that Adrian Hunter
           (Intel) has volunteered to step in as the maintainer for SDHCI.
      
           Future wise, I hope the community around SDHCI will continue to
           grow and that this release cycle can be the starting point of
           moving SDHCI into a better shape.  As a matter of fact, already in
           this cycle the re-factoring has begun, but of course there are also
           fixes and new features included.  Some highlights:
      
            - sdhci-iproc: Add support for Broadcom's BCM2835 eMMC IP
            - sdhci-acpi: Add support for QCOM controllers
            - sdhci-pic32: Add new SDHCI variant for PIC32MZDA
      
        Other hosts:
            - atmel-mci: Fix a NULL pointer dereference
            - mediatek: Add SD write-protect support
            - mmc_spi: Fix card detect in GPIO case
            - tmio/sdhi: Add r8a7795 support
            - tmio/sdhi: Some fixes and clean-ups
            - dw_mmc: Add HW reset support
            - dw_mmc: Some fixes and clean-ups
            - sunxi: Add support for MMC DDR52 mode"
      
      * tag 'mmc-v4.6' of git://git.linaro.org/people/ulf.hansson/mmc: (123 commits)
        mmc: sdhci-of-at91: fix wake-up issue when using runtime pm
        mmc: sdhci-pci: Do not set DMA mask in enable_dma()
        mmc: sdhci-acpi: Remove enable_dma() hook
        mmc: sdhci: Set DMA mask when adding host
        mmc: block: fix ABI regression of mmc_blk_ioctl
        mmc: atmel-mci: Check pdata for NULL before dereferencing it at DMA config
        mmc: core: remove redundant memset of sdio_read_cccr
        mmc: core: remove redundant memset of mmc_decode_cid
        mmc: of_mmc_spi: fix unused warning
        mmc: sdhci-of-arasan: add phy support for sdhci-of-arasan
        mmc: sdhci-of-arasan: fix missing sdhci_pltfm_free for err handling
        mmc: sdhci-of-arasan: remove disable clk_ahb from sdhci_arasan_resume
        Documentation: bindings: add description of phy for sdhci-of-arasan
        mmc: sdhci: Fix override of timeout clk wrt max_busy_timeout
        mmc: mmci: Remove unnecessary header file
        mmc: sdhci-acpi: add QCOM controllers
        mmc: tegra: implement memcomp pad calibration
        mmc: mediatek: Use mmc_regulator_set_vqmmc in start_signal_voltage_switch
        mmc: mediatek: Change signal voltage error to dev_dbg()
        mmc: sh_mmcif, tmio: Use ARCH_RENESAS
        ...
      e531cdf5
    • Linus Torvalds's avatar
      Merge tag 'md/4.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shli/md · 4526b710
      Linus Torvalds authored
      Pull MD updates from Shaohua Li:
       "This update mainly fixes bugs.
      
         - a raid5 discard related fix from Jes
         - a MD multipath bio clone fix from Ming
         - raid1 error handling deadlock fix from Nate and corresponding
           raid10 fix from myself
         - a raid5 stripe batch fix from Neil
         - a patch from Sebastian to avoid unnecessary uevent
         - several cleanup/debug patches"
      
      * tag 'md/4.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shli/md:
        md/raid5: Cleanup cpu hotplug notifier
        raid10: include bio_end_io_list in nr_queued to prevent freeze_array hang
        raid1: include bio_end_io_list in nr_queued to prevent freeze_array hang
        md: fix typos for stipe
        md/bitmap: remove redundant return in bitmap_checkpage
        md/raid1: remove unnecessary BUG_ON
        md: multipath: don't hardcopy bio in .make_request path
        md/raid5: output stripe state for debug
        md/raid5: preserve STRIPE_PREREAD_ACTIVE in break_stripe_batch_list
        Update MD git tree URL
        md/bitmap: remove redundant check
        MD: warn for potential deadlock
        md: Drop sending a change uevent when stopping
        RAID5: revert e9e4c377 to fix a livelock
        RAID5: check_reshape() shouldn't call mddev_suspend
        md/raid5: Compare apples to apples (or sectors to sectors)
      4526b710
    • Linus Torvalds's avatar
      [media] vsp1: use proper dma alloc/free functions · 770c4c11
      Linus Torvalds authored
      I noticed this while merging the drm tree and checking for stragglers:
      the vsp1 driver still used dma_[alloc|free]_writecombine() that got
      renamed in commit f6e45661 ("dma, mm/pat: Rename
      dma_*_writecombine() to dma_*_wc()")
      
      I should have noticed back in the media merge (commit bace3db5
      
      ), but
      better late than never.
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      770c4c11
    • Linus Torvalds's avatar
      Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux · 266c73b7
      Linus Torvalds authored
      Pull drm updates from Dave Airlie:
       "This is the main drm pull request for 4.6 kernel.
      
        Overall the coolest thing here for me is the nouveau maxwell signed
        firmware support from NVidia, it's taken a long while to extract this
        from them.
      
        I also wish the ARM vendors just designed one set of display IP, ARM
        display block proliferation is definitely increasing.
      
        Core:
           - drm_event cleanups
           - Internal API cleanup making mode_fixup optional.
           - Apple GMUX vga switcheroo support.
           - DP AUX testing interface
      
        Panel:
           - Refactoring of DSI core for use over more transports.
      
        New driver:
           - ARM hdlcd driver
      
        i915:
           - FBC/PSR (framebuffer compression, panel self refresh) enabled by default.
           - Ongoing atomic display support work
           - Ongoing runtime PM work
           - Pixel clock limit checks
           - VBT DSI description support
           - GEM fixes
           - GuC firmware scheduler enhancements
      
        amdkfd:
           - Deferred probing fixes to avoid make file or link ordering.
      
        amdgpu/radeon:
           - ACP support for i2s audio support.
           - Command Submission/GPU scheduler/GPUVM optimisations
           - Initial GPU reset support for amdgpu
      
        vmwgfx:
           - Support for DX10 gen mipmaps
           - Pageflipping and other fixes.
      
        exynos:
           - Exynos5420 SoC support for FIMD
           - Exynos5422 SoC support for MIPI-DSI
      
        nouveau:
           - GM20x secure boot support - adds acceleration for Maxwell GPUs.
           - GM200 support
           - GM20B clock driver support
           - Power sensors work
      
        etnaviv:
           - Correctness fixes for GPU cache flushing
           - Better support for i.MX6 systems.
      
        imx-drm:
           - VBlank IRQ support
           - Fence support
           - OF endpoint support
      
        msm:
           - HDMI support for 8996 (snapdragon 820)
           - Adreno 430 support
           - Timestamp queries support
      
        virtio-gpu:
           - Fixes for Android support.
      
        rockchip:
           - Add support for Innosilicion HDMI
      
        rcar-du:
           - Support for 4 crtcs
           - R8A7795 support
           - RCar Gen 3 support
      
        omapdrm:
           - HDMI interlace output support
           - dma-buf import support
           - Refactoring to remove a lot of legacy code.
      
        tilcdc:
           - Rewrite of pageflipping code
           - dma-buf support
           - pinctrl support
      
        vc4:
           - HDMI modesetting bug fixes
           - Significant 3D performance improvement.
      
        fsl-dcu (FreeScale):
           - Lots of fixes
      
        tegra:
           - Two small fixes
      
        sti:
           - Atomic support for planes
           - Improved HDMI support"
      
      * 'drm-next' of git://people.freedesktop.org/~airlied/linux: (1063 commits)
        drm/amdgpu: release_pages requires linux/pagemap.h
        drm/sti: restore mode_fixup callback
        drm/amdgpu/gfx7: add MTYPE definition
        drm/amdgpu: removing BO_VAs shouldn't be interruptible
        drm/amd/powerplay: show uvd/vce power gate enablement for tonga.
        drm/amd/powerplay: show uvd/vce power gate info for fiji
        drm/amdgpu: use sched fence if possible
        drm/amdgpu: move ib.fence to job.fence
        drm/amdgpu: give a fence param to ib_free
        drm/amdgpu: include the right version of gmc header files for iceland
        drm/radeon: fix indentation.
        drm/amd/powerplay: add uvd/vce dpm enabling flag to fix the performance issue for CZ
        drm/amdgpu: switch back to 32bit hw fences v2
        drm/amdgpu: remove amdgpu_fence_is_signaled
        drm/amdgpu: drop the extra fence range check v2
        drm/amdgpu: signal fences directly in amdgpu_fence_process
        drm/amdgpu: cleanup amdgpu_fence_wait_empty v2
        drm/amdgpu: keep all fences in an RCU protected array v2
        drm/amdgpu: add number of hardware submissions to amdgpu_fence_driver_init_ring
        drm/amdgpu: RCU protected amd_sched_fence_release
        ...
      266c73b7
    • Linus Torvalds's avatar
      Merge tag 'arm64-perf' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux · 2c856e14
      Linus Torvalds authored
      Pull arm[64] perf updates from Will Deacon:
       "I have another mixed bag of ARM-related perf patches here.
      
        It's about 25% CPU and 75% interconnect, but with drivers/bus/
        languishing without an obvious maintainer or tree, Olof and I agreed
        to keep all of these PMU patches together.  I suspect a whole load of
        code from drivers/bus/arm-* can be moved under drivers/perf/, so
        that's on the radar for the future.
      
        Summary:
      
         - Initial support for ARMv8.1 CPU PMUs
      
         - Support for the CPU PMU in Cavium ThunderX
      
         - CPU PMU support for systems running 32-bit Linux in secure mode
      
         - Support for the system PMU in ARM CCI-550 (Cache Coherent Interconnect)"
      
      * tag 'arm64-perf' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux: (26 commits)
        drivers/perf: arm_pmu: avoid NULL dereference when not using devicetree
        arm64: perf: Extend ARMV8_EVTYPE_MASK to include PMCR.LC
        arm-cci: remove unused variable
        arm-cci: don't return value from void function
        arm-cci: make private functions static
        arm-cci: CoreLink CCI-550 PMU driver
        arm-cci500: Rearrange PMU driver for code sharing with CCI-550 PMU
        arm-cci: CCI-500: Work around PMU counter writes
        arm-cci: Provide hook for writing to PMU counters
        arm-cci: Add helper to enable PMU without synchornising counters
        arm-cci: Add routines to save/restore all counters
        arm-cci: Get the status of a counter
        arm-cci: write_counter: Remove redundant check
        arm-cci: Delay PMU counter writes to pmu::pmu_enable
        arm-cci: Refactor CCI PMU enable/disable methods
        arm-cci: Group writes to counter
        arm-cci: fix handling cpumask_any_but return value
        arm-cci: simplify sysfs attr handling
        drivers/perf: arm_pmu: implement CPU_PM notifier
        arm64: dts: Add Cavium ThunderX specific PMU
        ...
      2c856e14
    • Linus Torvalds's avatar
      Merge tag 'arc-4.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc · d34687ab
      Linus Torvalds authored
      Pull ARC architecture updates from Vineet Gupta:
       - Big Endian io accessors fix [Lada]
       - Spellos fixes [Adam]
       - Fix for DW GMAC breakage [Alexey]
       - Making DMA API 64-bit ready
       - Shutting up -Wmaybe-uninitialized noise for ARC
       - Other minor fixes here and there, comments update
      
      * tag 'arc-4.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc: (21 commits)
        ARCv2: ioremap: Support dynamic peripheral address space
        ARC: dma: reintroduce platform specific dma<->phys
        ARC: dma: ioremap: use phys_addr_t consistenctly in code paths
        ARC: dma: pass_phys() not sg_virt() to cache ops
        ARC: dma: non-coherent pages need V-P mapping if in HIGHMEM
        ARC: dma: Use struct page based page allocator helpers
        ARC: build: Turn off -Wmaybe-uninitialized for ARC gcc 4.8
        ARC: [plat-axs10x] add Ethernet PHY description in .dts
        arc: use of_platform_default_populate() to populate default bus
        ARC: thp: unbork !CONFIG_TRANSPARENT_HUGEPAGE build
        arc: [plat-nsimosci*] use ezchip network driver
        ARCv2: LLSC: software backoff is NOT needed starting HS2.1c
        ARC: mm: Use virt_to_pfn() for addr >> PAGE_SHIFT pattern
        ARC: [plat-nsim] document ranges
        ARC: build: Better way to detect ISA compatible toolchain
        ARCv2: Allow enabling PAE40 w/o HIGHMEM
        ARC: [BE] readl()/writel() to work in Big Endian CPU configuration
        ARC: [*defconfig] No need to specify CONFIG_CROSS_COMPILE
        ARC: [BE] Select correct CROSS_COMPILE prefix
        ARC: bitops: Remove non relevant comments
        ...
      d34687ab
    • Linus Torvalds's avatar
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs · 77d91317
      Linus Torvalds authored
      Pull UDF and quota updates from Jan Kara:
       "This contains a rewrite of UDF handling of filename encoding to fix
        remaining overflow issues from Andrew Gabbasov and quota changes to
        support new Q_[X]GETNEXTQUOTA quotactl for VFS quota formats"
      
      * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
        quota: Fix possible GPF due to uninitialised pointers
        ext4: Make Q_GETNEXTQUOTA work for quota in hidden inodes
        quota: Forbid Q_GETQUOTA and Q_GETNEXTQUOTA for frozen filesystem
        quota: Fix possible races during quota loading
        ocfs2: Implement get_next_id()
        quota_v2: Implement get_next_id() for V2 quota format
        quota: Add support for ->get_nextdqblk() for VFS quota
        udf: Merge linux specific translation into CS0 conversion function
        udf: Remove struct ustr as non-needed intermediate storage
        udf: Use separate buffer for copying split names
        udf: Adjust UDF_NAME_LEN to better reflect actual restrictions
        udf: Join functions for UTF8 and NLS conversions
        udf: Parameterize output length in udf_put_filename
        quota: Allow Q_GETQUOTA for frozen filesystem
        quota: Fixup comments about return value of Q_[X]GETNEXTQUOTA
      77d91317
    • Linus Torvalds's avatar
      Merge tag 'xfs-for-linus-4.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/dgc/linux-xfs · 53d2e697
      Linus Torvalds authored
      Pull xfs updates from Dave Chinner:
       "There's quite a lot in this request, and there's some cross-over with
        ext4, dax and quota code due to the nature of the changes being made.
      
        As for the rest of the XFS changes, there are lots of little things
        all over the place, which add up to a lot of changes in the end.
      
        The major changes are that we've reduced the size of the struct
        xfs_inode by ~100 bytes (gives an inode cache footprint reduction of
        >10%), the writepage code now only does a single set of mapping tree
        lockups so uses less CPU, delayed allocation reservations won't
        overrun under random write loads anymore, and we added compile time
        verification for on-disk structure sizes so we find out when a commit
        or platform/compiler change breaks the on disk structure as early as
        possible.
      
        Change summary:
      
         - error propagation for direct IO failures fixes for both XFS and
           ext4
         - new quota interfaces and XFS implementation for iterating all the
           quota IDs in the filesystem
         - locking fixes for real-time device extent allocation
         - reduction of duplicate information in the xfs and vfs inode, saving
           roughly 100 bytes of memory per cached inode.
         - buffer flag cleanup
         - rework of the writepage code to use the generic write clustering
           mechanisms
         - several fixes for inode flag based DAX enablement
         - rework of remount option parsing
         - compile time verification of on-disk format structure sizes
         - delayed allocation reservation overrun fixes
         - lots of little error handling fixes
         - small memory leak fixes
         - enable xfsaild freezing again"
      
      * tag 'xfs-for-linus-4.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/dgc/linux-xfs: (66 commits)
        xfs: always set rvalp in xfs_dir2_node_trim_free
        xfs: ensure committed is initialized in xfs_trans_roll
        xfs: borrow indirect blocks from freed extent when available
        xfs: refactor delalloc indlen reservation split into helper
        xfs: update freeblocks counter after extent deletion
        xfs: debug mode forced buffered write failure
        xfs: remove impossible condition
        xfs: check sizes of XFS on-disk structures at compile time
        xfs: ioends require logically contiguous file offsets
        xfs: use named array initializers for log item dumping
        xfs: fix computation of inode btree maxlevels
        xfs: reinitialise per-AG structures if geometry changes during recovery
        xfs: remove xfs_trans_get_block_res
        xfs: fix up inode32/64 (re)mount handling
        xfs: fix format specifier , should be %llx and not %llu
        xfs: sanitize remount options
        xfs: convert mount option parsing to tokens
        xfs: fix two memory leaks in xfs_attr_list.c error paths
        xfs: XFS_DIFLAG2_DAX limited by PAGE_SIZE
        xfs: dynamically switch modes when XFS_DIFLAG2_DAX is set/cleared
        ...
      53d2e697
    • Linus Torvalds's avatar
      Merge tag 'for-f2fs-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs · d407574e
      Linus Torvalds authored
      Pull f2fs updates from Jaegeuk Kim:
       "New Features:
         - uplift filesystem encryption into fs/crypto/
         - give sysfs entries to control memroy consumption
      
        Enhancements:
         - aio performance by preallocating blocks in ->write_iter
         - use writepages lock for only WB_SYNC_ALL
         - avoid redundant inline_data conversion
         - enhance forground GC
         - use wait_for_stable_page as possible
         - speed up SEEK_DATA and fiiemap
      
        Bug Fixes:
         - corner case in terms of -ENOSPC for inline_data
         - hung task caused by long latency in shrinker
         - corruption between atomic write and f2fs_trace_pid
         - avoid garbage lengths in dentries
         - revoke atomicly written pages if an error occurs
      
        In addition, there are various minor bug fixes and clean-ups"
      
      * tag 'for-f2fs-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs: (81 commits)
        f2fs: submit node page write bios when really required
        f2fs: add missing argument to f2fs_setxattr stub
        f2fs: fix to avoid unneeded unlock_new_inode
        f2fs: clean up opened code with f2fs_update_dentry
        f2fs: declare static functions
        f2fs: use cryptoapi crc32 functions
        f2fs: modify the readahead method in ra_node_page()
        f2fs crypto: sync ext4_lookup and ext4_file_open
        fs crypto: move per-file encryption from f2fs tree to fs/crypto
        f2fs: mutex can't be used by down_write_nest_lock()
        f2fs: recovery missing dot dentries in root directory
        f2fs: fix to avoid deadlock when merging inline data
        f2fs: introduce f2fs_flush_merged_bios for cleanup
        f2fs: introduce f2fs_update_data_blkaddr for cleanup
        f2fs crypto: fix incorrect positioning for GCing encrypted data page
        f2fs: fix incorrect upper bound when iterating inode mapping tree
        f2fs: avoid hungtask problem caused by losing wake_up
        f2fs: trace old block address for CoWed page
        f2fs: try to flush inode after merging inline data
        f2fs: show more info about superblock recovery
        ...
      d407574e
    • Linus Torvalds's avatar
      Merge branch 'for-4.6-ns' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup · 5518f66b
      Linus Torvalds authored
      Pull cgroup namespace support from Tejun Heo:
       "These are changes to implement namespace support for cgroup which has
        been pending for quite some time now.  It is very straight-forward and
        only affects what part of cgroup hierarchies are visible.
      
        After unsharing, mounting a cgroup fs will be scoped to the cgroups
        the task belonged to at the time of unsharing and the cgroup paths
        exposed to userland would be adjusted accordingly"
      
      * 'for-4.6-ns' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
        cgroup: fix and restructure error handling in copy_cgroup_ns()
        cgroup: fix alloc_cgroup_ns() error handling in copy_cgroup_ns()
        Add FS_USERNS_FLAG to cgroup fs
        cgroup: Add documentation for cgroup namespaces
        cgroup: mount cgroupns-root when inside non-init cgroupns
        kernfs: define kernfs_node_dentry
        cgroup: cgroup namespace setns support
        cgroup: introduce cgroup namespaces
        sched: new clone flag CLONE_NEWCGROUP for cgroup namespace
        kernfs: Add API to generate relative kernfs path
      5518f66b
    • Chris Mason's avatar
      btrfs: make sure we stay inside the bvec during __btrfs_lookup_bio_sums · 389f239c
      Chris Mason authored
      Commit c40a3d38
      
       (Btrfs: Compute and look up csums based on
      sectorsized blocks) changes around how we walk the bios while looking up
      crcs.  There's an inner loop that is jumping to the next bvec based on
      sectors and before it derefs the next bvec, it needs to make sure we're
      still in the bio.
      
      In this case, the outer loop would have decided to stop moving forward
      too, and the bvec deref is never actually used for anything.  But
      CONFIG_DEBUG_PAGEALLOC catches it because we're outside our bio.
      Signed-off-by: default avatarChris Mason <clm@fb.com>
      Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
      389f239c
    • Will Deacon's avatar
      drivers/perf: arm_pmu: avoid NULL dereference when not using devicetree · 357b565d
      Will Deacon authored
      Commit c6b90653
      
       ("drivers/perf: arm_pmu: make info messages more
      verbose") breaks booting on systems where the PMU is probed without
      devicetree (e.g by inspecting the MIDR of the current CPU). In this case,
      pdev->dev.of_node is NULL and we shouldn't try to access its ->fullname
      field when printing probe error messages.
      
      This patch fixes the probing code to use of_node_full_name, which safely
      handles NULL nodes and removes the "Error %i" part of the string, since
      it's not terribly useful.
      Reported-by: default avatarGuenter Roeck <private@roeck-us.net>
      Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
      357b565d
    • Stephen Rothwell's avatar
      drm/amdgpu: release_pages requires linux/pagemap.h · 568d7c76
      Stephen Rothwell authored
      
      Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
      Reviewed-by: Christian König <christian.koenig@amd.com.
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      568d7c76