1. 18 May, 2012 2 commits
  2. 14 May, 2012 1 commit
  3. 11 May, 2012 1 commit
  4. 10 May, 2012 3 commits
  5. 09 May, 2012 8 commits
    • Arnd Bergmann's avatar
      Merge branch 'ux500-devicetree-for-arm-soc' of... · 70888a4b
      Arnd Bergmann authored
      Merge branch 'ux500-devicetree-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/dt
      
      From: Linus Walleij <linus.walleij@linaro.org>:
        Four core patches paving the way for device tree enablement
        of the Snowball and ux500 at large by Lee Jones.
      
      * 'ux500-devicetree-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
        ARM: ux500: Enable PRCMU Timer 4 (clocksource) for Device Tree
        ARM: ux500: Disable SMSC911x platform code registration when DT is enabled
        ARM: ux500: Fork cpu-db8500 platform_devs for sequential DT enablement
        ARM: ux500: Do not attempt to register non-existent i2c devices on Snowball
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      [olof: rebuilt branch due to drop of an early merge]
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      70888a4b
    • Arnd Bergmann's avatar
      Merge tag 'at91-for-next-dt' of git://github.com/at91linux/linux-at91 into next/dt · 47fad7c6
      Arnd Bergmann authored
      "Jean-Christophe PLAGNIOL-VILLARD" <plagnioj@jcrosoft.com> writes:
      
       ARM: AT91 more DT material
      
       New SoC conversion and boards support
      
       SoC convertion to DT:
        - at91sam9260
        - at91sam9263
      
       boards:
        - Atmel at91sam9g20ek/9263ek
        - Calao TNY-A9260/A9263/A9G20
        - Calao USB-A9260/A9263
        - Ethernnut 5
        - Kizbox
      
      * tag 'at91-for-next-dt' of git://github.com/at91linux/linux-at91: (32 commits)
        Ethernut 5 board support
        ARM: at91: add kizbox board dt support.
        ARM: at91: DT: add Calao TNY A9263 board support
        ARM: at91: DT: add Calao USB A9263 board support
        ARM: at91: add at91sam9263ek DT support
        ARM: at91: add at91sam9263 DT support
        ARM: at91: standard device init only if DT is not populated.
        ARM: at91: DT: add Calao USB A9260 DT support
        ARM: at91: Calao USB A926x factorize common binding in usb_a9260_common
        ARM: at91: USB A926x update nand partition
        ARM: at91: add at91sam9g20ek boards dt support
        arm: at91: add Calao TNY-A9260 and TNY-A9G20 board support
        ARM: at91: add at91sam9260 DT support
        ARM: at91: add defconfig for device tree
        ARM: at91/dt: do not specify the board any more
        ARN: at91: introduce SOC_AT91xxx define to allow to compile SoC core support
        ARM: at91: add SOC_AT91SAM9 kconfig option to factorise select
        ARM: at91: pm select memory controler at runtime
        ARM: at91: move at91_init_leds to board init
        ARM: at91: do not pin mux the UARTs in init_early
        ...
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      [olof: rebuilt branch due to drop of an early merge]
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      47fad7c6
    • Arnd Bergmann's avatar
      Merge branch 'ux500-devicetree-for-arm-soc' of... · e86bde3c
      Arnd Bergmann authored
      Merge branch 'ux500-devicetree-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/dt
      
      Linus Walleij <linus.walleij@linaro.org> writes:
      
        this pull request contains some device tree work by Lee Jones.
        I have tried to keep these patches in the arch/arm/boot/dts/*
        space to get some sanity in the branch proliferation.
      
        There is still one patch that touches arch/arm/mach-ux500 too
        though (but it should merge fine with the other ux500 stuff).
      
        The changes to the device tree are of course dependent on some
        core changes and some patching in the GPIO/pin driver, but as
        the device tree files are believed to be a different world
        (and should one day live in their own git) I split this off
        anyway. I don't think people bisect the device trees per se
        and the board code in conjunction anyway.
      
      * 'ux500-devicetree-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
        ARM: ux500: Configure the PRCMU Timer for db8500 based devices in DT
        ARM: ux500: Enable the SMSC9115 on Snowball via Device Tree
        drivers/gpio: represent gpio-nomadik as an IRQ controller in DT documentation
        ARM: ux500: Rename gpio_keys in the Device Tree file
        drivers/gpio: gpio-nomadik: Provide documentation for Device Tree bindings
        drivers/gpio: gpio-nomadik: Device Tree bindings
        ARM: ux500: Enable the external bus with Device Tree
        ARM: ux500: Shorten Snowball's DT compatible gpio entry
        ARM: ux500: Rename the DT compatible entry for i2c devices on Snowball
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      [olof: rebuilt branch due to drop of an early merge]
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      e86bde3c
    • Arnd Bergmann's avatar
      Merge branch 'spear/dt' into next/dt · 6875dc65
      Arnd Bergmann authored
      * spear/dt:
        ARM: SPEAr3xx: Correct keyboard data passed from DT
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      [olof: rebuilt branch due to drop of an early merge]
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      6875dc65
    • Arnd Bergmann's avatar
      Merge branch 'lpc32xx/dt' of git://git.antcom.de/linux-2.6 into next/dt · 22251a9b
      Arnd Bergmann authored
      Roland Stigge <stigge@antcom.de> writes:
        this is a rearrangement of all mach-lpc32xx specific patches for device
        tree conversion. Please note that:
      
        * It builds upon the i2c-pnx changes (see previous pull request, branch
          lpc32xx/i2c)
        * Dave Miller gave permission to merge the lpc_eth.c change via arm-soc
          (patch 1/8)
      
        The rest of the patches is mach-lpc32xx only.
      
      * 'lpc32xx/dt' of git://git.antcom.de/linux-2.6:
        ARM: LPC32xx: Defconfig update
        ARM: LPC32xx: Move common code to common.c
        ARM: LPC32xx: Device tree support
        ARM: LPC32xx: DTS files for device tree conversion
        ARM: LPC32xx: Remove obsolete platform Kconfig
        ARM: LPC32xx: clock.c registration adjustment
        ARM: LPC32xx: clock.c cleanup
        net: Add device tree support to LPC32xx
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      [olof: rebuilt branch due to drop of an early merge]
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      22251a9b
    • Arnd Bergmann's avatar
      Merge branch 'depends/i2c/lpc32xx' into next/dt · 48bfdb21
      Arnd Bergmann authored
      As a prerequisite for merging the lpc32xx DT changes, this
      pulls in the depends/i2c/lpc32xx branch that contains
      changes to the pnx-i2c driver, which are already in the
      i2c tree. The branch is available also on
      
         git://git.antcom.de/linux-2.6.git lpc32xx/i2c
      
      Roland Stigge <stigge@antcom.de> writes:
      
       this is the series of the 4 patches adding device tree support to i2c-pnx
       (used by LPC32xx) that Wolfram Sang already applied to the i2c subsystem.
       Since both drivers/i2c/ and mach-lpc32xx are touched here, there will
       probably be conflicts that you need to be aware of.
      
       I'm posting this again for arm-soc since the actual mach-lpc32xx specific
       DT conversion builds upon those changes (see next pull request), especially
       in arch/arm/mach-lpc32xx/common.c.
      
       Wolfram already gave permission to merge this via arm-soc, but please
       coordinate and tell me if I can help resolving this.
      
      Further, this implicitly updates the next/dt branch to v3.4-rc4, which
      causes a trivial conflict from a change in one branch in code that
      gets removed in another.
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      [olof: rebuilt branch due to drop of an early merge]
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      48bfdb21
    • Arnd Bergmann's avatar
      Merge branch 'spear/dt' into next/dt · 19f36bfa
      Arnd Bergmann authored
      This is a rebased version of parts of
        git://git.stlinux.com/spear/linux-2.6.git spear-v3.5
      
      which was accidentally based on the linux-next tree and mixed too
      many different things. The pinctrl related changes from the same
      branch are now in the spear/pinctrl branch of arm-soc.
      
      There are a few non-DT cleanups mixed in here, but fundamentally
      it's all related to the DT conversion.
      
      * spear/dt: (9 commits)
        ARM: spear: remove most mach/*.h header contents
        SPEAr: Update defconfigs
        SPEAr: Add PL080 DMA support for 3xx and 6xx
        ARM: SPEAr3xx: Add device-tree support to SPEAr3xx architecture
        SPEAr3xx: Replace printk() with pr_*()
        SPEAr6xx: Add compilation support for dtbs using 'make dtbs'
        SPEAr3xx: Add clock instance of usb hosts - ehci and ohci 0 and 1
        SPEAr: Use CLKDEV_INIT for defining clk_lookups
        ARM: SPEAr600: Change FSMC and SMI clock names
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      [olof: rebuilt branch due to drop of an early merge]
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      19f36bfa
    • Arnd Bergmann's avatar
      Merge branch 'renesas/dt' into next/dt · 02abb80f
      Arnd Bergmann authored
      First part of DT changes for the Renesas shmobile platform,
      pulled from:
      
        git://git.kernel.org/pub/scm/linux/kernel/git/rafael/renesas.git dt
      
      * renesas/dt:
        ARM: mach-shmobile: sh7372 generic board support via DT V2
        ARM: mach-shmobile: Rework sh7372 INTCS demuxer V2
        ARM: mach-shmobile: Use INTC_IRQ_PINS_16H on sh7372
        ARM: mach-shmobile: Use 0x3400 as INTCS vector offset
        ARM: mach-shmobile: Introduce INTC_IRQ_PINS_16H
        ARM: mach-shmobile: Introduce shmobile_setup_delay()
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      [olof: rebuilt branch due to drop of an early merge]
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      02abb80f
  6. 08 May, 2012 2 commits
  7. 05 May, 2012 9 commits
  8. 01 May, 2012 4 commits
  9. 30 Apr, 2012 1 commit
  10. 29 Apr, 2012 7 commits
    • Linus Torvalds's avatar
      Linux 3.4-rc5 · 69964ea4
      Linus Torvalds authored
      69964ea4
    • Linus Torvalds's avatar
      Merge tag 'pm-for-3.4-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 6cfdd02b
      Linus Torvalds authored
      Pull power management fixes from Rafael J. Wysocki:
       "Fix for an issue causing hibernation to hang on systems with highmem
        (that practically means i386) due to broken memory management (bug
        introduced in 3.2, so -stable material) and PM documentation update
        making the freezer documentation follow the code again after some
        recent updates."
      
      * tag 'pm-for-3.4-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        PM / Freezer / Docs: Update documentation about freezing of tasks
        PM / Hibernate: fix the number of pages used for hibernate/thaw buffering
      6cfdd02b
    • Linus Torvalds's avatar
      autofs: make the autofsv5 packet file descriptor use a packetized pipe · 64f371bc
      Linus Torvalds authored
      The autofs packet size has had a very unfortunate size problem on x86:
      because the alignment of 'u64' differs in 32-bit and 64-bit modes, and
      because the packet data was not 8-byte aligned, the size of the autofsv5
      packet structure differed between 32-bit and 64-bit modes despite
      looking otherwise identical (300 vs 304 bytes respectively).
      
      We first fixed that up by making the 64-bit compat mode know about this
      problem in commit a32744d4 ("autofs: work around unhappy compat
      problem on x86-64"), and that made a 32-bit 'systemd' work happily on a
      64-bit kernel because everything then worked the same way as on a 32-bit
      kernel.
      
      But it turned out that 'automount' had actually known and worked around
      this problem in user space, so fixing the kernel to do the proper 32-bit
      compatibility handling actually *broke* 32-bit automount on a 64-bit
      kernel, because it knew that the packet sizes were wrong and expected
      those incorrect sizes.
      
      As a result, we ended up reverting that compatibility mode fix, and
      thus breaking systemd again, in commit fcbf94b9.
      
      With both automount and systemd doing a single read() system call, and
      verifying that they get *exactly* the size they expect but using
      different sizes, it seemed that fixing one of them inevitably seemed to
      break the other.  At one point, a patch I seriously considered applying
      from Michael Tokarev did a "strcmp()" to see if it was automount that
      was doing the operation.  Ugly, ugly.
      
      However, a prettier solution exists now thanks to the packetized pipe
      mode.  By marking the communication pipe as being packetized (by simply
      setting the O_DIRECT flag), we can always just write the bigger packet
      size, and if user-space does a smaller read, it will just get that
      partial end result and the extra alignment padding will simply be thrown
      away.
      
      This makes both automount and systemd happy, since they now get the size
      they asked for, and the kernel side of autofs simply no longer needs to
      care - it could pad out the packet arbitrarily.
      
      Of course, if there is some *other* user of autofs (please, please,
      please tell me it ain't so - and we haven't heard of any) that tries to
      read the packets with multiple writes, that other user will now be
      broken - the whole point of the packetized mode is that one system call
      gets exactly one packet, and you cannot read a packet in pieces.
      Tested-by: default avatarMichael Tokarev <mjt@tls.msk.ru>
      Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
      Cc: David Miller <davem@davemloft.net>
      Cc: Ian Kent <raven@themaw.net>
      Cc: Thomas Meyer <thomas@m3y3r.de>
      Cc: stable@kernel.org
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      64f371bc
    • Marcos Paulo de Souza's avatar
      PM / Freezer / Docs: Update documentation about freezing of tasks · 26e0f90f
      Marcos Paulo de Souza authored
      The file Documentation/power/freezing-of-tasks.txt was still referencing
      the TIF_FREEZE flag, that was removed by the commit
      d88e4cb6(freezer: remove now unused
      TIF_FREEZE).
      
      This patch removes all the references of TIF_FREEZE that were left
      behind.
      Signed-off-by: default avatarMarcos Paulo de Souza <marcos.souza.org@gmail.com>
      Signed-off-by: default avatarSrivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
      Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
      26e0f90f
    • Linus Torvalds's avatar
      pipes: add a "packetized pipe" mode for writing · 9883035a
      Linus Torvalds authored
      The actual internal pipe implementation is already really about
      individual packets (called "pipe buffers"), and this simply exposes that
      as a special packetized mode.
      
      When we are in the packetized mode (marked by O_DIRECT as suggested by
      Alan Cox), a write() on a pipe will not merge the new data with previous
      writes, so each write will get a pipe buffer of its own.  The pipe
      buffer is then marked with the PIPE_BUF_FLAG_PACKET flag, which in turn
      will tell the reader side to break the read at that boundary (and throw
      away any partial packet contents that do not fit in the read buffer).
      
      End result: as long as you do writes less than PIPE_BUF in size (so that
      the pipe doesn't have to split them up), you can now treat the pipe as a
      packet interface, where each read() system call will read one packet at
      a time.  You can just use a sufficiently big read buffer (PIPE_BUF is
      sufficient, since bigger than that doesn't guarantee atomicity anyway),
      and the return value of the read() will naturally give you the size of
      the packet.
      
      NOTE! We do not support zero-sized packets, and zero-sized reads and
      writes to a pipe continue to be no-ops.  Also note that big packets will
      currently be split at write time, but that the size at which that
      happens is not really specified (except that it's bigger than PIPE_BUF).
      Currently that limit is the system page size, but we might want to
      explicitly support bigger packets some day.
      
      The main user for this is going to be the autofs packet interface,
      allowing us to stop having to care so deeply about exact packet sizes
      (which have had bugs with 32/64-bit compatibility modes).  But user
      space can create packetized pipes with "pipe2(fd, O_DIRECT)", which will
      fail with an EINVAL on kernels that do not support this interface.
      Tested-by: default avatarMichael Tokarev <mjt@tls.msk.ru>
      Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
      Cc: David Miller <davem@davemloft.net>
      Cc: Ian Kent <raven@themaw.net>
      Cc: Thomas Meyer <thomas@m3y3r.de>
      Cc: stable@kernel.org  # needed for systemd/autofs interaction fix
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      9883035a
    • Linus Torvalds's avatar
      Merge tag 'staging-3.4-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging · de9e24ed
      Linus Torvalds authored
      Pull staging tree fixes from Greg Kroah-Hartman:
       "Here are some tiny drivers/staging/ bugfixes.  Some build fixes that
        were recently reported, as well as one kfree bug that is hitting a
        number of users."
      
      * tag 'staging-3.4-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
        staging: ozwpan: Fix bug where kfree is called twice.
        staging: octeon-ethernet: fix build errors by including interrupt.h
        staging: zcache: fix Kconfig crypto dependency
        staging: tidspbridge: remove usage of OMAP2_L4_IO_ADDRESS
      de9e24ed
    • Linus Torvalds's avatar
      Merge tag 'usb-3.4-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb · 8d7d1adc
      Linus Torvalds authored
      Pull USB fixes from Greg Kroah-Hartman:
       "Here are a number of small USB fixes for 3.4-rc5.
      
        Nothing major, as before, some USB gadget fixes.  There's a crash fix
        for a number of ASUS laptops on resume that had been reported by a
        number of different people.  We think the fix might also pertain to
        other machines, as this was a BIOS bug, and they seem to travel to
        different models and manufacturers quite easily.  Other than that,
        some other reported problems fixed as well."
      
      * tag 'usb-3.4-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
        usb: gadget: udc-core: fix incompatibility with dummy-hcd
        usb: gadget: udc-core: fix wrong call order
        USB: cdc-wdm: fix race leading leading to memory corruption
        USB: EHCI: fix crash during suspend on ASUS computers
        usb gadget: uvc: uvc_request_data::length field must be signed
        usb: gadget: dummy: do not call pullup() on udc_stop()
        usb: musb: davinci.c: add missing unregister
        usb: musb: drop __deprecated flag
        USB: gadget: storage gadgets send wrong error code for unknown commands
        usb: otg: gpio_vbus: Add otg transceiver events and notifiers
      8d7d1adc
  11. 28 Apr, 2012 2 commits
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs · f7b00693
      Linus Torvalds authored
      Pull btrfs fixes from Chris Mason:
       "This has our collection of bug fixes.  I missed the last rc because I
        thought our patches were making NFS crash during my xfs test runs.
        Turns out it was an NFS client bug fixed by someone else while I tried
        to bisect it.
      
        All of these fixes are small, but some are fairly high impact.  The
        biggest are fixes for our mount -o remount handling, a deadlock due to
        GFP_KERNEL allocations in readdir, and a RAID10 error handling bug.
      
        This was tested against both 3.3 and Linus' master as of this morning."
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: (26 commits)
        Btrfs: reduce lock contention during extent insertion
        Btrfs: avoid deadlocks from GFP_KERNEL allocations during btrfs_real_readdir
        Btrfs: Fix space checking during fs resize
        Btrfs: fix block_rsv and space_info lock ordering
        Btrfs: Prevent root_list corruption
        Btrfs: fix repair code for RAID10
        Btrfs: do not start delalloc inodes during sync
        Btrfs: fix that check_int_data mount option was ignored
        Btrfs: don't count CRC or header errors twice while scrubbing
        Btrfs: fix btrfs_ioctl_dev_info() crash on missing device
        btrfs: don't return EINTR
        Btrfs: double unlock bug in error handling
        Btrfs: always store the mirror we read the eb from
        fs/btrfs/volumes.c: add missing free_fs_devices
        btrfs: fix early abort in 'remount'
        Btrfs: fix max chunk size check in chunk allocator
        Btrfs: add missing read locks in backref.c
        Btrfs: don't call free_extent_buffer twice in iterate_irefs
        Btrfs: Make free_ipath() deal gracefully with NULL pointers
        Btrfs: avoid possible use-after-free in clear_extent_bit()
        ...
      f7b00693
    • Linus Torvalds's avatar
      Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · b990f9b3
      Linus Torvalds authored
      Pull ARM SoC fixes from Olof Johansson:
       "Nothing controversial, just another batch of fixes:
      
         - Samsung/exynos fixes for more merge window fallout: build errors
           and warnings mostly, but also some clock/device setup issues on
           exynos4/5
         - PXA bug and warning fixes related to gpio and pinmux
         - IRQ domain conversion bugfixes for U300 and MSM
         - A regulator setup fix for U300"
      
      * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
        ARM: PXA2xx: MFP: fix potential direction bug
        ARM: PXA2xx: MFP: fix bug with MFP_LPM_KEEP_OUTPUT
        arm/sa1100: fix sa1100-rtc memory resource
        ARM: pxa: fix gpio wakeup setting
        ARM: SAMSUNG: add missing MMC_CAP2_BROKEN_VOLTAGE capability
        ARM: EXYNOS: Fix compilation error when CONFIG_OF is not defined
        ARM: EXYNOS: Fix resource on dev-dwmci.c
        ARM: S3C24XX: Fix build warning for S3C2410_PM
        ARM: mini2440_defconfig: Fix build error
        ARM: msm: Fix gic irqdomain support
        ARM: EXYNOS: Fix incorrect initialization of GIC
        ARM: EXYNOS: use 'exynos4-sdhci' as device name for sdhci controllers
        ARM: u300: bump all IRQ numbers by one
        ARM: ux300: Fix unimplementable regulation constraints
      b990f9b3