1. 02 May, 2013 16 commits
    • Linus Torvalds's avatar
      Merge tag 'pinctrl-fixes-v3.10-1' of... · fbe8ed63
      Linus Torvalds authored
      Merge tag 'pinctrl-fixes-v3.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl
      Pull pinctrl fixes from Linus Walleij:
       "Two fixes to the pinctrl subsystem for v3.10:
         - A quite apparent mutex fix in an untested codepath
         - A compile warning fix in the plgpio driver"
      * tag 'pinctrl-fixes-v3.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:
        pinctrl: fix mutex deadlock in get_pinctrl_dev_from_of_node()
        pinctrl: plgpio: add CONFIG_PM_SLEEP to suspend/resume functions
    • Linus Torvalds's avatar
      Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux · 99bece77
      Linus Torvalds authored
      Pull i2c changes from Wolfram Sang:
       - an arbitration driver.  While the driver is quite simple, it caused
         discussion if we need additional arbitration on top of the one
         specified in the I2C standard.  Conclusion is that I accept a few
         generic mechanisms, but not very specific ones.
       - the core lost the detach_adapter() call.  It has no users anymore and
         was in the way for other cleanups.  attach_adapter() is sadly still
         there since there are users waiting to be converted.
       - the core gained a bus recovery infrastructure.  I2C defines a way to
         recover if the data line is stalled.  This mechanism is now in the
         core and drivers can now pass some data to make use of it.
       - bigger driver cleanups for designware, s3c2410
       - removing superfluous refcounting from drivers
       - removing Ben Dooks as second maintainer due to inactivity.  Thanks
         for all your work so far, Ben!
       - bugfixes, feature additions, devicetree fixups, simplifications...
      * 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: (38 commits)
        i2c: xiic: must always write 16-bit words to TX_FIFO
        i2c: octeon: use HZ in timeout value
        i2c: octeon: Fix i2c fail problem when a process is terminated by a signal
        i2c: designware-pci: drop superfluous {get|put}_device
        i2c: designware-plat: drop superfluous {get|put}_device
        i2c: davinci: drop superfluous {get|put}_device
        MAINTAINERS: Ben Dooks is inactive regarding I2C
        i2c: mux: Add i2c-arb-gpio-challenge 'mux' driver
        i2c: at91: convert to dma_request_slave_channel_compat()
        i2c: mxs: do error checking and handling in PIO mode
        i2c: mxs: remove races in PIO code
        i2c-designware: switch to use runtime PM autosuspend
        i2c-designware: use usleep_range() in the busy-loop
        i2c-designware: enable/disable the controller properly
        i2c-designware: use dynamic adapter numbering on Lynxpoint
        i2c-designware-pci: use managed functions pcim_* and devm_*
        i2c-designware-pci: use dev_err() instead of printk()
        i2c-designware: move to managed functions (devm_*)
        i2c: remove CONFIG_HOTPLUG ifdefs
        i2c: s3c2410: Add SMBus emulation for block read
    • Linus Torvalds's avatar
      Merge tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux · 736a2dd2
      Linus Torvalds authored
      Pull virtio & lguest updates from Rusty Russell:
       "Lots of virtio work which wasn't quite ready for last merge window.
        Plus I dived into lguest again, reworking the pagetable code so we can
        move the switcher page: our fixmaps sometimes take more than 2MB now..."
      Ugh.  Annoying conflicts with the tcm_vhost -> vhost_scsi rename.
      Hopefully correctly resolved.
      * tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux: (57 commits)
        caif_virtio: Remove bouncing email addresses
        lguest: improve code readability in lg_cpu_start.
        virtio-net: fill only rx queues which are being used
        lguest: map Switcher below fixmap.
        lguest: cache last cpu we ran on.
        lguest: map Switcher text whenever we allocate a new pagetable.
        lguest: don't share Switcher PTE pages between guests.
        lguest: expost switcher_pages array (as lg_switcher_pages).
        lguest: extract shadow PTE walking / allocating.
        lguest: make check_gpte et. al return bool.
        lguest: assume Switcher text is a single page.
        lguest: rename switcher_page to switcher_pages.
        lguest: remove RESERVE_MEM constant.
        lguest: check vaddr not pgd for Switcher protection.
        lguest: prepare to make SWITCHER_ADDR a variable.
        virtio: console: replace EMFILE with EBUSY for already-open port
        virtio-scsi: reset virtqueue affinity when doing cpu hotplug
        virtio-scsi: introduce multiqueue support
        virtio-scsi: push vq lock/unlock into virtscsi_vq_done
        virtio-scsi: pass struct virtio_scsi to virtqueue completion function
    • Linus Torvalds's avatar
      Merge tag 'vfio-for-v3.10' of git://github.com/awilliam/linux-vfio · 0b2e3b6b
      Linus Torvalds authored
      Pull vfio updates from Alex Williamson:
       "Changes include extension to support PCI AER notification to
        userspace, byte granularity of PCI config space and access to
        unarchitected PCI config space, better protection around IOMMU driver
        accesses, default file mode fix, and a few misc cleanups."
      * tag 'vfio-for-v3.10' of git://github.com/awilliam/linux-vfio:
        vfio: Set container device mode
        vfio: Use down_reads to protect iommu disconnects
        vfio: Convert container->group_lock to rwsem
        PCI/VFIO: use pcie_flags_reg instead of access PCI-E Capabilities Register
        vfio-pci: Enable raw access to unassigned config space
        vfio-pci: Use byte granularity in config map
        vfio: make local function vfio_pci_intx_unmask_handler() static
        VFIO-AER: Vfio-pci driver changes for supporting AER
        VFIO: Wrapper for getting reference to vfio_device
    • Linus Torvalds's avatar
      Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost · e9589300
      Linus Torvalds authored
      Pull vhost cleanups and fixes from Michael Tsirkin:
       "Here are vhost cleanups and fixes by Asias He and myself.  They affect
        both vhost-net and vhost-scsi devices.  They also *depend* on both
        net-next and target-pending, where the net and target commits these
        changes depend on are already merged.  So merging through the common
        vhost tree."
      * tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
        vhost_scsi: module rename
        tcm_vhost: header split up
        vhost: src file renames
        vhost: fix error handling in RESET_OWNER ioctl
        tcm_vhost: remove virtio-net.h dependency
        vhost: move per-vq net specific fields out to net
        tcm_vhost: document inflight ref-counting use
        vhost: move vhost-net zerocopy fields to net.c
        tcm_vhost: Wait for pending requests in vhost_scsi_flush()
        vhost: Allow device specific fields per vq
    • Linus Torvalds's avatar
      Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc · 5a148af6
      Linus Torvalds authored
      Pull powerpc update from Benjamin Herrenschmidt:
       "The main highlights this time around are:
         - A pile of addition POWER8 bits and nits, such as updated
           performance counter support (Michael Ellerman), new branch history
           buffer support (Anshuman Khandual), base support for the new PCI
           host bridge when not using the hypervisor (Gavin Shan) and other
           random related bits and fixes from various contributors.
         - Some rework of our page table format by Aneesh Kumar which fixes a
           thing or two and paves the way for THP support.  THP itself will
           not make it this time around however.
         - More Freescale updates, including Altivec support on the new e6500
           cores, new PCI controller support, and a pile of new boards support
           and updates.
         - The usual batch of trivial cleanups & fixes"
      * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (156 commits)
        powerpc: Fix build error for book3e
        powerpc: Context switch the new EBB SPRs
        powerpc: Turn on the EBB H/FSCR bits
        powerpc: Replace CPU_FTR_BCTAR with CPU_FTR_ARCH_207S
        powerpc: Setup BHRB instructions facility in HFSCR for POWER8
        powerpc: Fix interrupt range check on debug exception
        powerpc: Update tlbie/tlbiel as per ISA doc
        powerpc: Print page size info during boot
        powerpc: print both base and actual page size on hash failure
        powerpc: Fix hpte_decode to use the correct decoding for page sizes
        powerpc: Decode the pte-lp-encoding bits correctly.
        powerpc: Use encode avpn where we need only avpn values
        powerpc: Reduce PTE table memory wastage
        powerpc: Move the pte free routines from common header
        powerpc: Reduce the PTE_INDEX_SIZE
        powerpc: Switch 16GB and 16MB explicit hugepages to a different page table format
        powerpc: New hugepage directory format
        powerpc: Don't truncate pgd_index wrongly
        powerpc: Don't hard code the size of pte page
        powerpc: Save DAR and DSISR in pt_regs on MCE
    • Linus Torvalds's avatar
      Merge tag 'multiplatform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 99c6bcf4
      Linus Torvalds authored
      Pull ARM SoC multiplatform updates from Olof Johansson:
       "More multiplatform enablement for ARM platforms.  The ones converted
        in this branch are:
         - bcm2835
         - cns3xxx
         - sirf
         - nomadik
         - msx
         - spear
         - tegra
         - ux500
        We're getting close to having most of them converted!
        One of the larger platforms remaining is Samsung Exynos, and there are
        a bunch of supporting patches in this merge window for it.  There was
        a patch in this branch to a early version of multiplatform conversion,
        but it ended up being reverted due to need of more bake time.  The
        revert commit is part of the branch since it would have required
        rebasing multiple dependent branches and they were stable by then"
      * tag 'multiplatform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (70 commits)
        mmc: sdhci-s3c: Fix operation on non-single image Samsung platforms
        clocksource: nomadik-mtu: fix up clocksource/timer
        Revert "ARM: exynos: enable multiplatform support"
        ARM: SPEAr13xx: Fix typo "ARCH_HAVE_CPUFREQ"
        ARM: exynos: enable multiplatform support
        rtc: s3c: make header file local
        mtd: onenand/samsung: make regs-onenand.h file local
        thermal/exynos: remove unnecessary header inclusions
        mmc: sdhci-s3c: remove platform dependencies
        ARM: samsung: move mfc device definition to s5p-dev-mfc.c
        ARM: exynos: move debug-macro.S to include/debug/
        ARM: exynos: prepare for sparse IRQ
        ARM: exynos: introduce EXYNOS_ATAGS symbol
        ARM: tegra: build assembly files with -march=armv7-a
        ARM: Push selects for TWD/SCU into machine entries
        ARM: ux500: build hotplug.o for ARMv7-a
        ARM: ux500: move to multiplatform
        ARM: ux500: make remaining headers local
        ARM: ux500: make irqs.h local to platform
        ARM: ux500: get rid of <mach/[hardware|db8500-regs].h>
    • Linus Torvalds's avatar
      Merge tag 'soc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 97b1007a
      Linus Torvalds authored
      Pull ARM SoC platform updates from Olof Johansson:
       "This branch contains part 1 of the platform updates for 3.10.  Among
        the highlights:
         - Support for the new Atmel Cortex-A5 based platforms (SAMA5D3)
         - New support for CSR SiRFatlas6 SoCs
         - A handful of updates for NVidia T114 (a.k.a. Tegra 4)
         - A bunch of updates for the shmobile platforms
         - A handful of updates for davinci
         - A few updates for Qualcomm MSM
         - Plus a handful of other patches, defconfig updates, etc."
      * tag 'soc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (135 commits)
        ARM: tegra: pm: fix build error w/o PM_SLEEP
        ARM: davinci: ensure global variables are declared
        ARM: davinci: sram.c: fix incorrect type in assignment
        ARM: davinci: da8xx dt: make file local symbols static
        ARM: davinci: da8xx: add remoteproc support
        ARM: socfpga: Upgrade clk driver for socfpga to make use of dts clock entries
        ARM: socfpga: Add clock entries into device tree
        ARM: socfpga: Enable soft reset
        ARM: EXYNOS: replace cpumask by the corresponding macro
        ARM: EXYNOS: handle properly the return values
        ARM: EXYNOS: factor out the idle states
        ARM: OMAP4: Enable fix for Cortex-A9 erratas
        ARM: OMAP2+: Export SoC information to userspace
        ARM: OMAP2+: SoC name and revision unification
        ARM: OMAP2+: Move common part of late init into common function
        ARM: tegra: pm: remove duplicated include from pm.c
        ARM: davinci: da850: override mmc DT node device name
        ARM: davinci: da850: add mmc DT entries
        mmc: davinci_mmc: add DT support
        ARM: SAMSUNG: check processor type before cache restoration in resume
    • Linus Torvalds's avatar
      Merge tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · dfab34aa
      Linus Torvalds authored
      Pull ARM SoC device-tree updates from Olof Johansson:
       "Part 1 of device-tree updates for 3.10.  The bulk of the churn in this
        branch is due to i.MX moving from C-defined pin control over to device
        tree, which is a one-time conversion that will allow greater
        flexibility down the road.
        Besides that, there's PCI-e bindings for Marvell mvebu platforms and a
        handful of cleanups to tegra due to the new include file functionality
        of the device tree compiler"
      * tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (113 commits)
        arm: mvebu: PCIe Device Tree informations for Armada XP GP
        arm: mvebu: PCIe Device Tree informations for Armada 370 DB
        arm: mvebu: PCIe Device Tree informations for Armada 370 Mirabox
        arm: mvebu: PCIe Device Tree informations for Armada XP DB
        arm: mvebu: PCIe Device Tree informations for OpenBlocks AX3-4
        arm: mvebu: add PCIe Device Tree informations for Armada XP
        arm: mvebu: add PCIe Device Tree informations for Armada 370
        ARM: sunxi: unify osc24M_fixed and osc24M
        arm: vt8500: Add SDHC support to WM8505 DT
        ARM: dts: Add a 64 bits version of the skeleton device tree
        ARM: mvebu: Add Device Bus and CFI flash memory support to defconfig
        ARM: mvebu: Add support for NOR flash device on Openblocks AX3 board
        ARM: mvebu: Add support for NOR flash device on Armada XP-GP board
        ARM: mvebu: Add Device Bus support for Armada 370/XP SoC
        ARM: dts: imx6dl-wandboard: Add USB Host support
        ARM: dts: imx51 cpu node
        ARM: dts: Add missing imx27-phytec-phycore dtb target
        ARM: dts: Add NFC support for i.MX27 Phytec PCM038 module
        ARM: i.MX51: Add PATA support
        ARM: dts: Add initial support for Wandboard Dual-Lite
    • Linus Torvalds's avatar
      Merge tag 'cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · a7726350
      Linus Torvalds authored
      Pull ARM SoC cleanup from Olof Johansson:
       "Here is a collection of cleanup patches.  Among the pieces that stand
        out are:
         - The deletion of h720x platforms
         - Split of at91 non-dt platforms to their own Kconfig file to keep
           them separate
         - General cleanups and refactoring of i.MX and MXS platforms
         - Some restructuring of clock tables for OMAP
         - Convertion of PMC driver for Tegra to dt-only
         - Some renames of sunxi -> sun4i (Allwinner A10)
         - ... plus a bunch of other stuff that I haven't mentioned"
      * tag 'cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (119 commits)
        ARM: i.MX: remove unused ARCH_* configs
        ARM i.MX53: remove platform ahci support
        ARM: sunxi: Rework the restart code
        irqchip: sunxi: Rename sunxi to sun4i
        irqchip: sunxi: Make use of the IRQCHIP_DECLARE macro
        clocksource: sunxi: Rename sunxi to sun4i
        clocksource: sunxi: make use of CLKSRC_OF
        clocksource: sunxi: Cleanup the timer code
        ARM: at91: remove trailing semicolon from macros
        ARM: at91/setup: fix trivial typos
        ARM: EXYNOS: remove "config EXYNOS_DEV_DRM"
        ARM: EXYNOS: change the name of USB ohci header
        ARM: SAMSUNG: Remove unnecessary code for dma
        ARM: S3C24XX: Remove unused GPIO drive strength register definitions
        ARM: OMAP4+: PM: Restore CPU power state to ON with clockdomain force wakeup method
        ARM: S3C24XX: Removed unneeded dependency on CPU_S3C2412
        ARM: S3C24XX: Removed unneeded dependency on CPU_S3C2410
        ARM: S3C24XX: Removed unneeded dependency on ARCH_S3C24XX for boards
        ARM: S5P64X0: Fix typo "CONFIG_S5P64X0_SETUP_SDHCI"
    • Linus Torvalds's avatar
      Merge tag 'fixes-nc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 4d26aa30
      Linus Torvalds authored
      Pull ARM SoC non-critical fixes from Olof Johansson:
       "Here is a collection of fixes (and some intermixed cleanups) that were
        considered less important and thus not included in the later parts of
        the 3.9-rc cycle.
        It's a bit all over the map, contents wise.  A series of ux500 fixes
        and cleanups, a bunch of various fixes for OMAP and tegra, and some
        for Freescale i.MX and even Qualcomm MSM.
        Note that there's also a patch on this branch to globally turn off
        -Wmaybe-uninitialized when building with -Os.  It's been posted
        several times by Arnd and no dissent was raised, but nobody seemed
        interested to pick it up.  So here it is, as the topmost patch."
      * tag 'fixes-nc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (70 commits)
        Turn off -Wmaybe-uninitialized when building with -Os
        ARM: orion5x: include linux/cpu.h
        ARM: tegra: call cpu_do_idle from C code
        ARM: u300: fix ages old copy/paste bug
        ARM: OMAP2+: add dependencies on ARCH_MULTI_V6/V7
        ARM: tegra: solve adr range issue with THUMB2_KERNEL enabled
        ARM: tegra: fix relocation truncated error when THUMB2_KERNEL enabled
        ARM: tegra: fix build error when THUMB2_KERNEL enabled
        ARM: msm: Fix uncompess.h tx underrun check
        ARM: vexpress: Remove A9 PMU compatible values for non-A9 platforms
        ARM: cpuimx27 and mbimx27: prepend CONFIG_ to Kconfig macro
        ARM: OMAP2+: fix typo "CONFIG_BRIDGE_DVFS"
        ARM: OMAP1: remove "config MACH_OMAP_HTCWIZARD"
        ARM: mach-imx: mach-imx6q: Fix sparse warnings
        ARM: mach-imx: src: Include "common.h
        ARM: mach-imx: gpc: Include "common.h"
        ARM: mach-imx: avic: Staticize *avic_base
        ARM: mach-imx: tzic: Staticize *tzic_base
        ARM: mach-imx: clk: Include "clk.h"
        ARM: mach-imx: clk-busy: Staticize clk_busy_mux_ops
    • Al Viro's avatar
      ipc_schedule_free() can do vfree() directly now · 600fe975
      Al Viro authored
      Commit 32fcfd40
       ("make vfree() safe to call from interrupt
      contexts") made it safe to do vfree directly from the RCU callback,
      which allows us to simplify ipc/util.c a lot by getting rid of the
      differences between vmalloc/kmalloc memory.
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    • David Miller's avatar
      net: Restore NETIF_F_* bit ordering. · 4ada8db3
      David Miller authored
      Commit 8ad227ff
       ("net: vlan: add 802.1ad support") added some new
      NETIF_F_* features bits, but it added them in the middle of existing
      Userland depends upon the flag bits via the per-netdevice 'flags' sysfs
      So restore the previous ordering by adding the new flags at the end.
      Reported-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    • Michael S. Tsirkin's avatar
      vhost_scsi: module rename · 181c04a3
      Michael S. Tsirkin authored
      Rename module and update Kconfig and Makefile.
      Add alias for compatibility with old userspace
      scripts if any.
      Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
      Reviewed-by: default avatarAsias He <asias@redhat.com>
      Acked-by: default avatarNicholas Bellinger <nab@linux-iscsi.org>
    • Michael S. Tsirkin's avatar
      tcm_vhost: header split up · 5012a3a3
      Michael S. Tsirkin authored
      move uapi parts to vhost.h
      move .c private parts to .c itself
      Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
      Reviewed-by: default avatarAsias He <asias@redhat.com>
      Acked-by: default avatarNicholas Bellinger <nab@linux-iscsi.org>
    • Michael S. Tsirkin's avatar
      vhost: src file renames · eb62b74e
      Michael S. Tsirkin authored
      Move tcm_vhost.c -> scsi.c
      Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
      Reviewed-by: default avatarAsias He <asias@redhat.com>
      Acked-by: default avatarNicholas Bellinger <nab@linux-iscsi.org>
  2. 01 May, 2013 24 commits