1. 05 Apr, 2013 29 commits
  2. 18 Mar, 2013 9 commits
    • Linus Torvalds's avatar
      Merge tag 'for-linus-20130318' of git://git.infradead.org/linux-mtd · 35f8c769
      Linus Torvalds authored
      Pull MTD fixes from David Woodhouse:
       "This fixes a couple of problems.  Firstly, some people are actually
        still using old small-page flash and we broke it by removing the ready
        check.
      
        Secondly.  fix the handling of partitions on Broadcom 47xx devices.
        Recent changes had made it misdetect the location of the NVRAM and
        scribble over the bootloader when it tried to update the variables
        there.  With predictably sad results."
      
      * tag 'for-linus-20130318' of git://git.infradead.org/linux-mtd:
        mtd: nand: reintroduce NAND_NO_READRDY as NAND_NEED_READRDY
        mtd: bcm47xxpart: look for NVRAM at the end of device
        Revert "mtd: bcm47xxpart: improve probing of nvram partition"
      35f8c769
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security · 4b767155
      Linus Torvalds authored
      Pull selinux bugfix from James Morris.
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
        selinux: use GFP_ATOMIC under spin_lock
      4b767155
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux · 991657a3
      Linus Torvalds authored
      Pull s390 fixes from Martin Schwidefsky:
       "A couple of bug fixes, the most hairy on is the flush_tlb_kernel_range
        fix.  Another case of "how could this ever have worked?"."
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
        s390/kdump: Do not add standby memory for kdump
        drivers/i2c: remove !S390 dependency, add missing GENERIC_HARDIRQS dependencies
        s390/scm: process availability
        s390/scm_blk: suspend writes
        s390/scm_drv: extend notify callback
        s390/scm_blk: fix request number accounting
        s390/mm: fix flush_tlb_kernel_range()
        s390/mm: fix vmemmap size calculation
        s390: critical section cleanup vs. machine checks
      991657a3
    • Linus Torvalds's avatar
      Merge tag 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 1c6ba37b
      Linus Torvalds authored
      Pull ARM SoC bug fixes from Arnd Bergmann:
       "Things are calming down for arm-soc as well.  This set of bug fixes is
        dominated in size by the at91 platform bug fixes.  Some of them were
        meant to go through the framebuffer tree during the merge window, but
        since the framebuffer maintainer could not be reached, I offered to
        take them here.  The other notable at91 change is the addition of
        pinctrl definitions to fix the NAND controller.
      
        The rest are mostly simple regression fixes:
      
         - Our removal of VIRT_TO_BUS conflicted with Stephen Rothwell's
           renaming of the Kconfig symbol.  You will get a trivial merge
           conflict here, we still want to remove it.
         - missing bits for clocks on imx and s5pv210
         - missing header inclusions in mmp and shmobile
         - typos in s5pv210 camera and vt8500 clock support code
      
        and three trivial fixes for pre-3.8 bugs:
      
         - an old bogus build warning in the joystick driver
         - a misleading Kconfig description
         - a NULL pointer check on davinci"
      
      * tag 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
        ARM: fix CONFIG_VIRT_TO_BUS handling
        ARM: i.MX35: enable MAX clock
        ARM: Scorpion is a v7 architecture, not v6
        ARM: mmp: add platform_device head file in gplugd
        input/joystick: use get_cycles on ARM
        [media] s5p-fimc: fix s5pv210 build
        clk: vt8500: Fix "fix device clock divisor calculations"
        ARM: i.MX25: Fix DT compilation
        ARM: at91: fix infinite loop in at91_irq_suspend/resume
        ARM: at91: add gpio suspend/resume support when using pinctrl
        ARM: at91: fix LCD-wiring mode
        atmel_lcdfb: fix 16-bpp modes on older SOCs
        ARM: at91: dt: at91sam9x5: complete NAND pinctrl
        ARM: at91: dt: at91sam9x5: correct NAND pins comments
        ARM: davinci: edma: fix dmaengine induced null pointer dereference on da830
        ARM: shmobile: marzen: Include mmc/host.h
        ARM: EXYNOS: Add #dma-cells for generic dma binding support for PL330
        ARM: S5PV210: Fix PL330 DMA controller clkdev entries
      1c6ba37b
    • Linus Torvalds's avatar
      Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc · a15cd063
      Linus Torvalds authored
      Pull powerpc fixes from Ben Herrenschmidt:
       "Here's a few powerpc fixes for 3.9, mostly regressions (though not all
        from 3.9 merge window) that we've been hammering into shape over the
        last couple of weeks.  They fix booting on Cell and G5 among other
        things (yes, we've been a bit sloppy with older machines this time
        around)."
      
      * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
        powerpc: Rename USER_ESID_BITS* to ESID_BITS*
        powerpc: Update kernel VSID range
        powerpc: Make VSID_BITS* dependency explicit
        powerpc: Make sure that we alays include CONFIG_BINFMT_ELF
        powerpc/ptrace: Fix brk.len used uninitialised
        powerpc: Fix -mcmodel=medium breakage in prom_init.c
        powerpc: Remove last traces of POWER4_ONLY
        powerpc: Fix cputable entry for 970MP rev 1.0
        powerpc: Fix STAB initialization
      a15cd063
    • Linus Torvalds's avatar
      Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm · 6210d421
      Linus Torvalds authored
      Pull ARM fixes from Russell King:
       "Just three fixes this time - a fix for a fix for our memset function,
        fixing the dummy clockevent so that it doesn't interfere with real
        hardware clockevents, and fixing a build error for Tegra."
      
      * 'fixes' of git://git.linaro.org/people/rmk/linux-arm:
        ARM: 7675/1: amba: tegra-ahb: Fix build error w/ PM_SLEEP w/o PM_RUNTIME
        ARM: 7674/1: smp: Avoid dummy clockevent being preferred over real hardware clock-event
        ARM: 7670/1: fix the memset fix
      6210d421
    • Arnd Bergmann's avatar
      ARM: fix CONFIG_VIRT_TO_BUS handling · b4811bac
      Arnd Bergmann authored
      887cbce0 "arch Kconfig: centralise CONFIG_ARCH_NO_VIRT_TO_BUS"
      and  4febd95a "Select VIRT_TO_BUS directly where needed" from
      Stephen Rothwell changed globally how CONFIG_VIRT_TO_BUS is
      selected, while my own a5d533ee "ARM: disable virt_to_bus/
      virt_to_bus almost everywhere" was merged at the same time and
      changed which platforms select it on ARM.
      
      The result of this conflict was that we again see CONFIG_VIRT_TO_BUS
      on all ARM systems. This patch fixes up the problem and removes
      CONFIG_ARCH_NO_VIRT_TO_BUS again on ARM.
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      Cc: Russell King <linux@arm.linux.org.uk>
      Cc: Stephen Rothwell <sfr@canb.auug.org.au>
      b4811bac
    • Dan Carpenter's avatar
      selinux: use GFP_ATOMIC under spin_lock · 4502403d
      Dan Carpenter authored
      The call tree here is:
      
      sk_clone_lock()              <- takes bh_lock_sock(newsk);
      xfrm_sk_clone_policy()
      __xfrm_sk_clone_policy()
      clone_policy()               <- uses GFP_ATOMIC for allocations
      security_xfrm_policy_clone()
      security_ops->xfrm_policy_clone_security()
      selinux_xfrm_policy_clone()
      Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
      Cc: stable@kernel.org
      Signed-off-by: default avatarJames Morris <james.l.morris@oracle.com>
      4502403d
    • Arnd Bergmann's avatar
      Merge tag 'renesas-fixes-for-v3.9' of... · ace71f49
      Arnd Bergmann authored
      Merge tag 'renesas-fixes-for-v3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into fixes
      
      From Simon Horman <horms@verge.net.au>:
      
      Resolve a build failure present since v3.9-rc1
      
      * tag 'renesas-fixes-for-v3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
        ARM: shmobile: marzen: Include mmc/host.h
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      ace71f49
  3. 17 Mar, 2013 2 commits