1. 12 Jun, 2014 32 commits
    • Dmitry Kasatkin's avatar
      evm: replace HMAC version with attribute mask · d3b33679
      Dmitry Kasatkin authored
      Using HMAC version limits the posibility to arbitrarily add new
      attributes such as SMACK64EXEC to the hmac calculation.
      
      This patch replaces hmac version with attribute mask.
      Desired attributes can be enabled with configuration parameter.
      It allows to build kernels which works with previously labeled
      filesystems.
      
      Currently supported attribute is 'fsuuid' which is equivalent of
      the former version 2.
      Signed-off-by: default avatarDmitry Kasatkin <d.kasatkin@samsung.com>
      Signed-off-by: default avatarMimi Zohar <zohar@linux.vnet.ibm.com>
      d3b33679
    • Mimi Zohar's avatar
      ima: prevent new digsig xattr from being replaced · 060bdebf
      Mimi Zohar authored
      Even though a new xattr will only be appraised on the next access,
      set the DIGSIG flag to prevent a signature from being replaced with
      a hash on file close.
      Signed-off-by: default avatarMimi Zohar <zohar@linux.vnet.ibm.com>
      060bdebf
    • Linus Torvalds's avatar
      Merge tag 'dm-3.16-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm · 0e04c641
      Linus Torvalds authored
      Pull device mapper updates from Mike Snitzer:
       "This pull request is later than I'd have liked because I was waiting
        for some performance data to help finally justify sending the
        long-standing dm-crypt cpu scalability improvements upstream.
      
        Unfortunately we came up short, so those dm-crypt changes will
        continue to wait, but it seems we're not far off.
      
         . Add dm_accept_partial_bio interface to DM core to allow DM targets
           to only process a portion of a bio, the remainder being sent in the
           next bio.  This enables the old dm snapshot-origin target to only
           split write bios on chunk boundaries, read bios are now sent to the
           origin device unchanged.
      
         . Add DM core support for disabling WRITE SAME if the underlying SCSI
           layer disables it due to command failure.
      
         . Reduce lock contention in DM's bio-prison.
      
         . A few small cleanups and fixes to dm-thin and dm-era"
      
      * tag 'dm-3.16-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm:
        dm thin: update discard_granularity to reflect the thin-pool blocksize
        dm bio prison: implement per bucket locking in the dm_bio_prison hash table
        dm: remove symbol export for dm_set_device_limits
        dm: disable WRITE SAME if it fails
        dm era: check for a non-NULL metadata object before closing it
        dm thin: return ENOSPC instead of EIO when error_if_no_space enabled
        dm thin: cleanup noflush_work to use a proper completion
        dm snapshot: do not split read bios sent to snapshot-origin target
        dm snapshot: allocate a per-target structure for snapshot-origin target
        dm: introduce dm_accept_partial_bio
        dm: change sector_count member in clone_info from sector_t to unsigned
      0e04c641
    • Linus Torvalds's avatar
      Merge tag 'pci-v3.16-changes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci · 7550cfab
      Linus Torvalds authored
      Pull more PCI updates from Bjorn Helgaas:
       "Here are some more things I'd like to see in v3.16-rc1:
      
         - DMA alias iterator, part of some work to fix IOMMU issues
         - MVEBU, Tegra, DesignWare changes that I forgot to include before
         - Some whitespace code cleanup
      
        Details:
      
        IOMMU
          - Add DMA alias iterator (Alex Williamson)
          - Add DMA alias quirks for ASMedia, ITE, Tundra bridges (Alex Williamson)
          - Add DMA alias quirks for Marvell, Ricoh devices (Alex Williamson)
          - Add DMA alias quirk for HighPoint devices (Jérôme Carretero)
      
        MSI
          - Fix leak in free_msi_irqs() (Alexei Starovoitov)
      
        Marvell MVEBU
          - Remove unnecessary use of 'conf_lock' spinlock (Andrew Murray)
          - Avoid setting an undefined window size (Jason Gunthorpe)
          - Allow several windows with the same target/attribute (Thomas Petazzoni)
          - Split PCIe BARs into multiple MBus windows when needed (Thomas Petazzoni)
          - Fix off-by-one in the computed size of the mbus windows (Willy Tarreau)
      
        NVIDIA Tegra
          - Use new OF interrupt mapping when possible (Lucas Stach)
      
        Synopsys DesignWare
          - Remove unnecessary use of 'conf_lock' spinlock (Andrew Murray)
          - Use new OF interrupt mapping when possible (Lucas Stach)
          - Split Exynos and i.MX bindings (Lucas Stach)
          - Fix comment for setting number of lanes (Mohit Kumar)
          - Fix iATU programming for cfg1, io and mem viewport (Mohit Kumar)
      
        Miscellaneous
          - EXPORT_SYMBOL cleanup (Ryan Desfosses)
          - Whitespace cleanup (Ryan Desfosses)
          - Merge multi-line quoted strings (Ryan Desfosses)"
      
      * tag 'pci-v3.16-changes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: (21 commits)
        PCI: Add function 1 DMA alias quirk for HighPoint RocketRaid 642L
        PCI/MSI: Fix memory leak in free_msi_irqs()
        PCI: Merge multi-line quoted strings
        PCI: Whitespace cleanup
        PCI: Move EXPORT_SYMBOL so it immediately follows function/variable
        PCI: Add bridge DMA alias quirk for ITE bridge
        PCI: designware: Split Exynos and i.MX bindings
        PCI: Add bridge DMA alias quirk for ASMedia and Tundra bridges
        PCI: Add support for PCIe-to-PCI bridge DMA alias quirks
        PCI: Add function 1 DMA alias quirk for Marvell devices
        PCI: Add function 0 DMA alias quirk for Ricoh devices
        PCI: Add support for DMA alias quirks
        PCI: Convert pci_dev_flags definitions to bit shifts
        PCI: Add DMA alias iterator
        PCI: mvebu: Use '%pa' for printing 'phys_addr_t' type
        PCI: mvebu: Remove unnecessary use of 'conf_lock' spinlock
        PCI: designware: Remove unnecessary use of 'conf_lock' spinlock
        PCI: designware: Use new OF interrupt mapping when possible
        PCI: designware: Fix iATU programming for cfg1, io and mem viewport
        PCI: designware: Fix comment for setting number of lanes
        ...
      7550cfab
    • Linus Torvalds's avatar
      Merge tag 'pm+acpi-3.16-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 19c1940f
      Linus Torvalds authored
      Pull more ACPI and power management updates from Rafael Wysocki:
       "These are fixups on top of the previous PM+ACPI pull request,
        regression fixes (ACPI hotplug, cpufreq ppc-corenet), other bug fixes
        (ACPI reset, cpufreq), new PM trace points for system suspend
        profiling and a copyright notice update.
      
        Specifics:
      
         - I didn't remember correctly that the Hans de Goede's ACPI video
           patches actually didn't flip the video.use_native_backlight
           default, although we had discussed that and decided to do that.
           Since I said we would do that in the previous PM+ACPI pull request,
           make that change for real now.
      
         - ACPI bus check notifications for PCI host bridges don't cause the
           bus below the host bridge to be checked for changes as they should
           because of a mistake in the ACPI-based PCI hotplug (ACPIPHP)
           subsystem that forgets to add hotplug contexts to PCI host bridge
           ACPI device objects.  Create hotplug contexts for PCI host bridges
           too as appropriate.
      
         - Revert recent cpufreq commit related to the big.LITTLE cpufreq
           driver that breaks arm64 builds.
      
         - Fix for a regression in the ppc-corenet cpufreq driver introduced
           during the 3.15 cycle and causing the driver to use the remainder
           from do_div instead of the quotient.  From Ed Swarthout.
      
         - Resets triggered by panic activate a BUG_ON() in vmalloc.c on
           systems where the ACPI reset register is located in memory address
           space.  Fix from Randy Wright.
      
         - Fix for a problem with cpufreq governors that decisions made by
           them may be suboptimal due to the fact that deferrable timers are
           used by them for CPU load sampling.  From Srivatsa S Bhat.
      
         - Fix for a problem with the Tegra cpufreq driver where the CPU
           frequency is temporarily switched to a "stable" level that is
           different from both the initial and target frequencies during
           transitions which causes udelay() to expire earlier than it should
           sometimes.  From Viresh Kumar.
      
         - New trace points and rework of some existing trace points for
           system suspend/resume profiling from Todd Brandt.
      
         - Assorted cpufreq fixes and cleanups from Stratos Karafotis and
           Viresh Kumar.
      
         - Copyright notice update for suspend-and-cpuhotplug.txt from
           Srivatsa S Bhat"
      
      * tag 'pm+acpi-3.16-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        ACPI / hotplug / PCI: Add hotplug contexts to PCI host bridges
        PM / sleep: trace events for device PM callbacks
        cpufreq: cpufreq-cpu0: remove dependency on THERMAL and REGULATOR
        cpufreq: tegra: update comment for clarity
        cpufreq: intel_pstate: Remove duplicate CPU ID check
        cpufreq: Mark CPU0 driver with CPUFREQ_NEED_INITIAL_FREQ_CHECK flag
        PM / Documentation: Update copyright in suspend-and-cpuhotplug.txt
        cpufreq: governor: remove copy_prev_load from 'struct cpu_dbs_common_info'
        cpufreq: governor: Be friendly towards latency-sensitive bursty workloads
        PM / sleep: trace events for suspend/resume
        cpufreq: ppc-corenet-cpu-freq: do_div use quotient
        Revert "cpufreq: Enable big.LITTLE cpufreq driver on arm64"
        cpufreq: Tegra: implement intermediate frequency callbacks
        cpufreq: add support for intermediate (stable) frequencies
        ACPI / video: Change the default for video.use_native_backlight to 1
        ACPI: Fix bug when ACPI reset register is implemented in system memory
      19c1940f
    • Linus Torvalds's avatar
      Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds · 7c574cf6
      Linus Torvalds authored
      Pull LED updates from Bryan Wu:
       "I just found merge window is open and I'm quite busy and almost forget
        to send out this pull request.  Thanks Russell and Alexandre ping me
        about this.
      
        So basically we got some clean up and leds-pwm fixing patches from
        Russell"
      
      * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds:
        leds: Remove duplicated OOM message for individual driver
        drivers/leds: Replace __get_cpu_var use through this_cpu_ptr
        leds: lp55xx: add DT bindings for LP55231
        leds: 88pm860x: Fix missing refcount decrement for parent of_node
        leds: 88pm860x: Use of_get_child_by_name
        leds: leds-pwm: add DT support for LEDs wired to supply
        leds: leds-pwm: implement PWM inversion
        leds: leds-pwm: convert OF parsing code to use led_pwm_add()
        leds: leds-pwm: provide a common function to setup a single led-pwm device
        leds: pca9685: Remove leds-pca9685 driver
        dell-led: add mic mute led interface
      7c574cf6
    • Linus Torvalds's avatar
      Merge tag 'backlight-for-linus-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight · af76004c
      Linus Torvalds authored
      Pull backlight fixes from Lee Jones:
       "This merely contains some very basic build/run-time bug fixes"
      
      * tag 'backlight-for-linus-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight:
        backlight: gpio-backlight: Fix warning when the GPIO is on a I2C chip
        video/backlight: s6e63m0: Fix string type mismatch
        video/backlight: LP8788 needs PWM
        video/backlight: LP855X needs PWM
        video/pxa: LCD_CORGI needs BACKLIGHT_CLASS_DEVICE
        video/backlight: LM3630A needs PWM
      af76004c
    • Linus Torvalds's avatar
      Merge tag 'mfd-for-linus-3.16-1' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd · bae14e7a
      Linus Torvalds authored
      Pull more MFD updates from Lee Jones:
       "I missed collecting these patches due to a branch/tag naming
        ambiguity.  Completely my own fault, as I mindlessly named a branch
        and tag identically.  Sorry for the fuss.
      
        This pull-request contains some misplaced patches from Tony Lindgren
        that should have been part of the initial one"
      
      * tag 'mfd-for-linus-3.16-1' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd:
        mfd: twl4030-power: Add a configuration to turn off oscillator during off-idle
        mfd: twl4030-power: Add support for board specific configuration
        mfd: twl4030-power: Add recommended idle configuration
        mfd: twl4030-power: Add generic reset configuration
        mfd: twl4030-power: Fix some defines for SW_EVENTS
        mfd: twl4030-power: Fix hang on reboot if sleep configuration was loaded earlier
      bae14e7a
    • Linus Torvalds's avatar
      Merge tag 'mmc-v3.16-2' of git://git.linaro.org/people/ulf.hansson/mmc · 171c0621
      Linus Torvalds authored
      Pull MMC fixes from Ulf Hansson:
       "Here are some mmc fixes for 3.16.
      
         - fix some various compiler warnings
         - make atmel-mci compile again
         - fix regression for sdhci-msm"
      
      * tag 'mmc-v3.16-2' of git://git.linaro.org/people/ulf.hansson/mmc:
        mmc: simplify SDHCI Kconfig dependencies
        mmc: omap: don't select TPS65010
        mmc: mvsdio: avoid compiler warning
        mmc: atmel-mci: incude asm/cacheclush.h
        mmc: sdhci-msm: Fix fallout from sdhci refactoring
        mmc: usdhi6rol0: fix compiler warnings
      171c0621
    • Linus Torvalds's avatar
      Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux · 682b7c1c
      Linus Torvalds authored
      Pull drm updates from Dave Airlie:
       "This is the main drm merge window pull request, changes all over the
        place, mostly normal levels of churn.
      
        Highlights:
      
        Core drm:
           More cleanups, fix race on connector/encoder naming, docs updates,
           object locking rework in prep for atomic modeset
      
        i915:
           mipi DSI support, valleyview power fixes, cursor size fixes,
           execlist refactoring, vblank improvements, userptr support, OOM
           handling improvements
      
        radeon:
           GPUVM tuning and large page size support, gart fixes, deep color
           HDMI support, HDMI audio cleanups
      
        nouveau:
           - displayport rework should fix lots of issues
           - initial gk20a support
           - gk110b support
           - gk208 fixes
      
        exynos:
           probe order fixes, HDMI changes, IPP consolidation
      
        msm:
           debugfs updates, misc fixes
      
        ast:
           ast2400 support, sync with UMS driver
      
        tegra:
           cleanups, hdmi + hw cursor for Tegra 124.
      
        panel:
           fixes existing panels add some new ones.
      
        ipuv3:
           moved from staging to drivers/gpu"
      
      * 'drm-next' of git://people.freedesktop.org/~airlied/linux: (761 commits)
        drm/nouveau/disp/dp: fix tmds passthrough on dp connector
        drm/nouveau/dp: probe dpcd to determine connectedness
        drm/nv50-: trigger update after all connectors disabled
        drm/nv50-: prepare for attaching a SOR to multiple heads
        drm/gf119-/disp: fix debug output on update failure
        drm/nouveau/disp/dp: make use of postcursor when its available
        drm/g94-/disp/dp: take max pullup value across all lanes
        drm/nouveau/bios/dp: parse lane postcursor data
        drm/nouveau/dp: fix support for dpms
        drm/nouveau: register a drm_dp_aux channel for each dp connector
        drm/g94-/disp: add method to power-off dp lanes
        drm/nouveau/disp/dp: maintain link in response to hpd signal
        drm/g94-/disp: bash and wait for something after changing lane power regs
        drm/nouveau/disp/dp: split link config/power into two steps
        drm/nv50/disp: train PIOR-attached DP from second supervisor
        drm/nouveau/disp/dp: make use of existing output data for link training
        drm/gf119/disp: start removing direct vbios parsing from supervisor
        drm/nv50/disp: start removing direct vbios parsing from supervisor
        drm/nouveau/disp/dp: maintain receiver caps in response to hpd signal
        drm/nouveau/disp/dp: create subclass for dp outputs
        ...
      682b7c1c
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs · 16b90578
      Linus Torvalds authored
      Pull vfs updates from Al Viro:
       "This the bunch that sat in -next + lock_parent() fix.  This is the
        minimal set; there's more pending stuff.
      
        In particular, I really hope to get acct.c fixes merged this cycle -
        we need that to deal sanely with delayed-mntput stuff.  In the next
        pile, hopefully - that series is fairly short and localized
        (kernel/acct.c, fs/super.c and fs/namespace.c).  In this pile: more
        iov_iter work.  Most of prereqs for ->splice_write with sane locking
        order are there and Kent's dio rewrite would also fit nicely on top of
        this pile"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (70 commits)
        lock_parent: don't step on stale ->d_parent of all-but-freed one
        kill generic_file_splice_write()
        ceph: switch to iter_file_splice_write()
        shmem: switch to iter_file_splice_write()
        nfs: switch to iter_splice_write_file()
        fs/splice.c: remove unneeded exports
        ocfs2: switch to iter_file_splice_write()
        ->splice_write() via ->write_iter()
        bio_vec-backed iov_iter
        optimize copy_page_{to,from}_iter()
        bury generic_file_aio_{read,write}
        lustre: get rid of messing with iovecs
        ceph: switch to ->write_iter()
        ceph_sync_direct_write: stop poking into iov_iter guts
        ceph_sync_read: stop poking into iov_iter guts
        new helper: copy_page_from_iter()
        fuse: switch to ->write_iter()
        btrfs: switch to ->write_iter()
        ocfs2: switch to ->write_iter()
        xfs: switch to ->write_iter()
        ...
      16b90578
    • Rafael J. Wysocki's avatar
      Merge branch 'pm-sleep' · d715a226
      Rafael J. Wysocki authored
      * pm-sleep:
        PM / sleep: trace events for device PM callbacks
        PM / sleep: trace events for suspend/resume
      d715a226
    • Rafael J. Wysocki's avatar
      Merge branch 'pm-cpufreq' · 589e18a9
      Rafael J. Wysocki authored
      * pm-cpufreq:
        cpufreq: cpufreq-cpu0: remove dependency on THERMAL and REGULATOR
        cpufreq: tegra: update comment for clarity
        cpufreq: intel_pstate: Remove duplicate CPU ID check
        cpufreq: Mark CPU0 driver with CPUFREQ_NEED_INITIAL_FREQ_CHECK flag
        cpufreq: governor: remove copy_prev_load from 'struct cpu_dbs_common_info'
        cpufreq: governor: Be friendly towards latency-sensitive bursty workloads
        cpufreq: ppc-corenet-cpu-freq: do_div use quotient
        Revert "cpufreq: Enable big.LITTLE cpufreq driver on arm64"
        cpufreq: Tegra: implement intermediate frequency callbacks
        cpufreq: add support for intermediate (stable) frequencies
      589e18a9
    • Rafael J. Wysocki's avatar
      Merge branches 'acpi-general' and 'acpi-video' · de815a6d
      Rafael J. Wysocki authored
      * acpi-general:
        ACPI: Fix bug when ACPI reset register is implemented in system memory
      
      * acpi-video:
        ACPI / video: Change the default for video.use_native_backlight to 1
      de815a6d
    • Rafael J. Wysocki's avatar
      Merge branch 'acpi-hotplug' · 9d674f21
      Rafael J. Wysocki authored
      * acpi-hotplug:
        ACPI / hotplug / PCI: Add hotplug contexts to PCI host bridges
      9d674f21
    • Arnd Bergmann's avatar
      mmc: simplify SDHCI Kconfig dependencies · 5d01b768
      Arnd Bergmann authored
      We have a number of front-end drivers for SDHCI_PLTFM, some of them
      use 'select MMC_SDHCI_PLTFM', others use 'depends on'. This is
      inconsistent and confusing, and in one case has also led to a
      build error because of incomplete dependencies:
      
      warning: (MMC_SDHCI_PXAV3 && MMC_SDHCI_PXAV2 && MMC_SDHCI_BCM_KONA) selects MMC_SDHCI_PLTFM which has unmet direct dependencies (MMC && MMC_SDHCI)
      drivers/built-in.o: In function `sdhci_sirf_resume':
      :(.text+0xaaacb4): undefined reference to `sdhci_resume_host'
      drivers/built-in.o: In function `sdhci_sirf_suspend':
      :(.text+0xaaacf8): undefined reference to `sdhci_suspend_host'
      drivers/built-in.o: In function `sdhci_sirf_probe':
      :(.text+0xaaaf44): undefined reference to `sdhci_add_host'
      :(.text+0xaaaf50): undefined reference to `sdhci_remove_host'
      
      This changes Kconfig to use 'depends on MMC_SDHCI_PLTFM' for all these
      cases, to fix the build error and make the logic more logical.
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
      5d01b768
    • Arnd Bergmann's avatar
      mmc: omap: don't select TPS65010 · 60a549fc
      Arnd Bergmann authored
      The MMC host driver should not select the pmic driver, since that
      may have other dependencies, notably i2c in this case. It's not
      clear what the exact requirement of the driver is, but to preserve
      the behavior, this patch changes the 'select' into 'depends on',
      meaning you now have to turn on TPS65010 explicitly and then
      MMC_OMAP.
      
      Found during randconfig build testing.
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      Cc: linux-omap@vger.kernel.org
      Cc: Jarkko Nikula <jarkko.nikula@bitmer.com>
      Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
      60a549fc
    • Arnd Bergmann's avatar
      mmc: mvsdio: avoid compiler warning · d7fe833f
      Arnd Bergmann authored
      gcc correctly points out that hw_state can be used uninitially
      in the mvsd_setup_data() function. This rearranges the function
      to ensure it always contains a proper value.
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      Cc: Nicolas Pitre <nico@fluxnic.net>
      Cc: Chris Ball <chris@printf.net>
      Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
      Cc: Jason Cooper <jason@lakedaemon.net>
      Cc: Andrew Lunn <andrew@lunn.ch>
      Cc: linux-mmc@vger.kernel.org
      Acked-by: default avatarNicolas Pitre <nico@linaro.org>
      Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
      d7fe833f
    • Arnd Bergmann's avatar
      mmc: atmel-mci: incude asm/cacheclush.h · bf614c7a
      Arnd Bergmann authored
      This avoids a build error due to the use of flush_dcache_page.
      
      drivers/mmc/host/atmel-mci.c: In function 'atmci_read_data_pio':
      drivers/mmc/host/atmel-mci.c:1870:5: error: implicit declaration of function 'flush_dcache_page' [-Werror=implicit-function-declaration]
           flush_dcache_page(sg_page(sg));
           ^
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      Cc: Ludovic Desroches <ludovic.desroches@atmel.com>
      Acked-by: default avatarLudovic Desroches <ludovic.desroches@atmel.com>
      Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
      bf614c7a
    • Stephen Boyd's avatar
      mmc: sdhci-msm: Fix fallout from sdhci refactoring · ed1761d7
      Stephen Boyd authored
      The sdhci core was refactored recently and some of those
      refactorings required changes in every sdhci platform driver.
      Those updates happened around the same time as when the msm
      driver was merged so the refactorings missed the msm driver.
      Hook in the basic library functions so that we can boot apq8074
      dragonboards again instead of crashing when we try to jump to
      NULL function pointers.
      Reported-by: default avatarKevin Hilman <khilman@linaro.org>
      Cc: Georgi Djakov <gdjakov@mm-sol.com>
      Cc: Russell King <rmk+kernel@arm.linux.org.uk>
      Signed-off-by: default avatarStephen Boyd <sboyd@codeaurora.org>
      Acked-by: default avatarKumar Gala <galak@codeaurora.org>
      Reviewed-by: default avatarGeorgi Djakov <gdjakov@mm-sol.com>
      Tested-by: default avatarKevin Hilman <khilman@linaro.org>
      Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
      ed1761d7
    • Guennadi Liakhovetski's avatar
      mmc: usdhi6rol0: fix compiler warnings · 13fe0ec3
      Guennadi Liakhovetski authored
      Fix a number of wrong print formats.
      Signed-off-by: default avatarGuennadi Liakhovetski <g.liakhovetski+renesas@gmail.com>
      Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
      13fe0ec3
    • Al Viro's avatar
      lock_parent: don't step on stale ->d_parent of all-but-freed one · c2338f2d
      Al Viro authored
      Dentry that had been through (or into) __dentry_kill() might be seen
      by shrink_dentry_list(); that's normal, it'll be taken off the shrink
      list and freed if __dentry_kill() has already finished.  The problem
      is, its ->d_parent might be pointing to already freed dentry, so
      lock_parent() needs to be careful.
      
      We need to check that dentry hasn't already gone into __dentry_kill()
      *and* grab rcu_read_lock() before dropping ->d_lock - the latter makes
      sure that whatever we see in ->d_parent after dropping ->d_lock it
      won't be freed until we drop rcu_read_lock().
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
      c2338f2d
    • Al Viro's avatar
      Merge commit '9f12600f' into for-linus · 9c1d5284
      Al Viro authored
      Backmerge of dcache.c changes from mainline.  It's that, or complete
      rebase...
      
      Conflicts:
      	fs/splice.c
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
      9c1d5284
    • Al Viro's avatar
      kill generic_file_splice_write() · 5f073850
      Al Viro authored
      no callers left
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
      5f073850
    • Al Viro's avatar
      ceph: switch to iter_file_splice_write() · 3551dd79
      Al Viro authored
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
      3551dd79
    • Al Viro's avatar
      shmem: switch to iter_file_splice_write() · f6cb85d0
      Al Viro authored
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
      f6cb85d0
    • Al Viro's avatar
      nfs: switch to iter_splice_write_file() · 4da54c21
      Al Viro authored
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
      4da54c21
    • Al Viro's avatar
      fs/splice.c: remove unneeded exports · 96f9bc8f
      Al Viro authored
      ocfs2 was using a bunch of splice.c guts...
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
      96f9bc8f
    • Al Viro's avatar
      ocfs2: switch to iter_file_splice_write() · 6dc8bc0f
      Al Viro authored
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
      6dc8bc0f
    • Al Viro's avatar
      ->splice_write() via ->write_iter() · 8d020765
      Al Viro authored
      iter_file_splice_write() - a ->splice_write() instance that gathers the
      pipe buffers, builds a bio_vec-based iov_iter covering those and feeds
      it to ->write_iter().  A bunch of simple cases coverted to that...
      
      [AV: fixed the braino spotted by Cyrill]
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
      8d020765
    • Linus Torvalds's avatar
      Merge tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux · 5c02c392
      Linus Torvalds authored
      Pull virtio updates from Rusty Russell:
       "Main excitement is a virtio_scsi fix for alloc holding spinlock on the
        abort path, which I refuse to CC stable since (1) I discovered it
        myself, and (2) it's been there forever with no reports"
      
      * tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux:
        virtio_scsi: don't call virtqueue_add_sgs(... GFP_NOIO) holding spinlock.
        virtio-rng: fixes for device registration/unregistration
        virtio-rng: fix boot with virtio-rng device
        virtio-rng: support multiple virtio-rng devices
        virtio_ccw: introduce device_lost in virtio_ccw_device
        virtio: virtio_break_device() to mark all virtqueues broken.
      5c02c392
    • Linus Torvalds's avatar
      Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost · 3c81bdd9
      Linus Torvalds authored
      Pull vhost infrastructure updates from Michael S. Tsirkin:
       "This reworks vhost core dropping unnecessary RCU uses in favor of VQ
        mutexes which are used on fast path anyway.  This fixes worst-case
        latency for users which change the memory mappings a lot.  Memory
        allocation for vhost-net now supports fallback on vmalloc (same as for
        vhost-scsi) this makes it possible to create the device on systems
        where memory is very fragmented, with slightly lower performance"
      
      * tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
        vhost: move memory pointer to VQs
        vhost: move acked_features to VQs
        vhost: replace rcu with mutex
        vhost-net: extend device allocation to vmalloc
      3c81bdd9
  2. 11 Jun, 2014 8 commits
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile · 7ec6131b
      Linus Torvalds authored
      Pull arch/tile changes from Chris Metcalf:
       "These mostly just address smaller issues reported to me"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
        arch: tile: kernel: unaligned.c: Cleaning up uninitialized variables
        drivers/tty/hvc/hvc_tile.c: use PTR_ERR_OR_ZERO
        replace strict_strto* call with kstrto*
        tile: Update comments for generic idle conversion
        tile: cleanup the comment in init_pgprot
        tile: use BOOTMEM_DEFAULT instead of magic number 0 for reserve_bootmem flags
      7ec6131b
    • Linus Torvalds's avatar
      Merge tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux · 4251c2a6
      Linus Torvalds authored
      Pull module updates from Rusty Russell:
       "Most of this is cleaning up various driver sysfs permissions so we can
        re-add the perm check (we unified the module param and sysfs checks,
        but the module ones were stronger so we weakened them temporarily).
      
        Param parsing gets documented, and also "--" now forces args to be
        handed to init (and ignored by the kernel).
      
        Module NX/RO protections get tightened: we now set them before calling
        parse_args()"
      
      * tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux:
        module: set nx before marking module MODULE_STATE_COMING.
        samples/kobject/: avoid world-writable sysfs files.
        drivers/hid/hid-picolcd_fb: avoid world-writable sysfs files.
        drivers/staging/speakup/: avoid world-writable sysfs files.
        drivers/regulator/virtual: avoid world-writable sysfs files.
        drivers/scsi/pm8001/pm8001_ctl.c: avoid world-writable sysfs files.
        drivers/hid/hid-lg4ff.c: avoid world-writable sysfs files.
        drivers/video/fbdev/sm501fb.c: avoid world-writable sysfs files.
        drivers/mtd/devices/docg3.c: avoid world-writable sysfs files.
        speakup: fix incorrect perms on speakup_acntsa.c
        cpumask.h: silence warning with -Wsign-compare
        Documentation: Update kernel-parameters.tx
        param: hand arguments after -- straight to init
        modpost: Fix resource leak in read_dump()
      4251c2a6
    • Linus Torvalds's avatar
      Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux · c31c24b8
      Linus Torvalds authored
      Pull thermal management update from Zhang Rui:
       "Specifics:
      
         - fix a bug in Exynos thermal driver, which overwrites the hardware
           trip point threshold when updating software trigger levels and
           results in emergency shutdown.  From: Tushar Behera.
      
         - add thermal sensor support for Armada 375 and 38x SoCs.  From
           Ezequiel Garcia.
      
         - add TMU (Thermal Management Unit) support for Exynos5260 and
           Exynos5420 SoCs.  From Naveen Krishna Chatradhi.
      
         - add support for the additional digital temperature sensors in the
           Intel SoCs like Bay Trail.  From: Srinivas Pandruvada.
      
         - a couple of cleanups and small fixes from Jingoo Han, Bartlomiej
           Zolnierkiewicz, Geert Uytterhoeven, Jacob Pan, Paul Walmsley and
           Lan,Tianyu"
      
      * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux: (21 commits)
        thermal: spear: remove unnecessary OOM messages
        thermal: exynos: remove unnecessary OOM messages
        thermal: rcar: remove unnecessary OOM messages
        thermal: armada: Support Armada 380 SoC
        thermal: armada: Support Armada 375 SoC
        thermal: armada: Allow to specify an 'inverted readout' sensor
        thermal: armada: Pass the platform_device to init_sensor()
        thermal: armada: Add generic infrastructure to handle the sensor
        thermal: armada: Add infrastructure to support generic formulas
        thermal: armada: Rename armada_thermal_ops struct
        thermal/intel_powerclamp: add newer cpu ids
        thermal: rcar: Use pm_runtime_put() i.s.o. pm_runtime_put_sync()
        thermal: samsung: Only update available threshold limits
        Thermal/int3403: Fix thermal hysteresis unit conversion
        thermal: Intel SoC DTS thermal
        thermal: samsung: Add TMU support for Exynos5260 SoCs
        thermal: samsung: Add TMU support for Exynos5420 SoCs
        thermal: samsung: change base_common to more meaningful base_second
        thermal: samsung: replace inten_ bit fields with intclr_
        thermal: offer Samsung thermal support only when ARCH_EXYNOS is defined
        ...
      c31c24b8
    • Linus Torvalds's avatar
      Merge tag 'pwm/for-3.16-rc1' of... · 7f33e724
      Linus Torvalds authored
      Merge tag 'pwm/for-3.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm
      
      Pull pwm changes from Thierry Reding:
       "The majority of these changes are cleanups and fixes across all
        drivers.  Redundant error messages are removed and more PWM
        controllers set the .can_sleep flag to signal that they can't be used
        in atomic context.
      
        Support is added for the Broadcom Kona family of SoCs and the Intel
        LPSS driver can now probe PCI devices in addition to ACPI devices.
        Upon shutdown, the pwm-backlight driver will now power off the
        backlight.  It also uses the new descriptor-based GPIO API for more
        concise GPIO handling.
      
        A large chunk of these changes also converts platforms to use the
        lookup mechanism rather than relying on the global number space to
        reference PWM devices.  This is largely in preparation for more
        unification and cleanups in future patches.  Eventually it will allow
        the legacy PWM API to be removed"
      
      * tag 'pwm/for-3.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm: (38 commits)
        pwm: fsl-ftm: set pwm_chip can_sleep flag
        pwm: ab8500: Fix wrong value shift for disable/enable PWM
        pwm: samsung: do not set manual update bit in pwm_samsung_config
        pwm: lp3943: Set pwm_chip can_sleep flag
        pwm: atmel: set pwm_chip can_sleep flag
        pwm: mxs: set pwm_chip can_sleep flag
        pwm: tiehrpwm: inline accessor functions
        pwm: tiehrpwm: don't build PM related functions when not needed
        pwm-backlight: retrieve configured PWM period
        leds: leds-pwm: retrieve configured PWM period
        ARM: pxa: hx4700: use PWM_LOOKUP to initialize struct pwm_lookup
        ARM: shmobile: armadillo: use PWM_LOOKUP to initialize struct pwm_lookup
        ARM: OMAP3: Beagle: use PWM_LOOKUP to initialize struct pwm_lookup
        pwm: modify PWM_LOOKUP to initialize all struct pwm_lookup members
        ARM: pxa: hx4700: initialize all the struct pwm_lookup members
        ARM: OMAP3: Beagle: initialize all the struct pwm_lookup members
        pwm: renesas-tpu: remove unused struct tpu_pwm_platform_data
        ARM: shmobile: armadillo: initialize all struct pwm_lookup members
        pwm: add period and polarity to struct pwm_lookup
        pwm: twl: Really disable twl6030 PWMs
        ...
      7f33e724
    • Lukas Czerner's avatar
      dm thin: update discard_granularity to reflect the thin-pool blocksize · 09869de5
      Lukas Czerner authored
      DM thinp already checks whether the discard_granularity of the data
      device is a factor of the thin-pool block size.  But when using the
      dm-thin-pool's discard passdown support, DM thinp was not selecting the
      max of the underlying data device's discard_granularity and the
      thin-pool's block size.
      
      Update set_discard_limits() to set discard_granularity to the max of
      these values.  This enables blkdev_issue_discard() to properly align the
      discards that are sent to the DM thin device on a full block boundary.
      As such each discard will now cover an entire DM thin-pool block and the
      block will be reclaimed.
      Reported-by: default avatarZdenek Kabelac <zkabelac@redhat.com>
      Signed-off-by: default avatarLukas Czerner <lczerner@redhat.com>
      Signed-off-by: default avatarMike Snitzer <snitzer@redhat.com>
      Cc: stable@vger.kernel.org
      09869de5
    • Heinz Mauelshagen's avatar
      dm bio prison: implement per bucket locking in the dm_bio_prison hash table · adcc4447
      Heinz Mauelshagen authored
      Split the single per bio-prison lock by using per bucket locking.  Per
      bucket locking benefits both dm-thin and dm-cache targets by reducing
      bio-prison lock contention.
      Signed-off-by: default avatarHeinz Mauelshagen <heinzm@redhat.com>
      Signed-off-by: default avatarJoe Thornber <ejt@redhat.com>
      Signed-off-by: default avatarMike Snitzer <snitzer@redhat.com>
      adcc4447
    • Bjorn Helgaas's avatar
      Merge branches 'pci/msi', 'pci/iommu' and 'pci/cleanup' into next · 38a61482
      Bjorn Helgaas authored
      * pci/msi:
        PCI/MSI: Fix memory leak in free_msi_irqs()
      
      * pci/iommu:
        PCI: Add function 1 DMA alias quirk for HighPoint RocketRaid 642L
        PCI: Add bridge DMA alias quirk for ITE bridge
      
      * pci/cleanup:
        PCI: Merge multi-line quoted strings
        PCI: Whitespace cleanup
        PCI: Move EXPORT_SYMBOL so it immediately follows function/variable
      38a61482
    • Jérôme Carretero's avatar
      PCI: Add function 1 DMA alias quirk for HighPoint RocketRaid 642L · c2e0fb96
      Jérôme Carretero authored
      This device uses function 1 as the PCIe requester ID.
      
      This vendor has similar boards based on the same Marvell 88SE9235 chipset,
      but this patch was only tested with the 642L.
      
      Tested on ASUS Sabertooth 990FX (AMD).
      
      Link: https://bugzilla.kernel.org/show_bug.cgi?id=42679Signed-off-by: default avatarJérôme Carretero <cJ-ko@zougloub.eu>
      Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
      Acked-by: default avatarAlex Williamson <alex.williamson@redhat.com>
      c2e0fb96