1. 05 Apr, 2013 2 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 9 commits
  4. 16 Mar, 2013 8 commits
    • Liu Bo's avatar
      Btrfs: fix warning of free_extent_map · 3b277594
      Liu Bo authored
      Users report that an extent map's list is still linked when it's actually
      going to be freed from cache.
      
      The story is that
      
      a) when we're going to drop an extent map and may split this large one into
      smaller ems, and if this large one is flagged as EXTENT_FLAG_LOGGING which means
      that it's on the list to be logged, then the smaller ems split from it will also
      be flagged as EXTENT_FLAG_LOGGING, and this is _not_ expected.
      
      b) we'll keep ems from unlinking the list and freeing when they are flagged with
      EXTENT_FLAG_LOGGING, because the log code holds one reference.
      
      The end result is the warning, but the truth is that we set the flag
      EXTENT_FLAG_LOGGING only during fsync.
      
      So clear flag EXTENT_FLAG_LOGGING for extent maps split from a large one.
      Reported-by: default avatarJohannes Hirte <johannes.hirte@fem.tu-ilmenau.de>
      Reported-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
      Signed-off-by: default avatarLiu Bo <bo.li.liu@oracle.com>
      Signed-off-by: default avatarChris Mason <chris.mason@fusionio.com>
      3b277594
    • Linus Torvalds's avatar
      Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild · e2043785
      Linus Torvalds authored
      Pull kbuild fix from Michal Marek:
       "One fix for for make headers_install/headers_check to not require make
        3.81.  The requirement has been accidentally introduced in 3.7."
      
      * 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
        kbuild: fix make headers_check with make 3.80
      e2043785
    • Linus Torvalds's avatar
      Merge tag 'for-3.9-rc3' of git://openrisc.net/jonas/linux · 23659587
      Linus Torvalds authored
      Pull OpenRISC bug fixes from Jonas Bonn:
      
       - The GPIO descriptor work has exposed how broken the non-GPIOLIB bits
         for OpenRISC were.  We now require GPIOLIB as this is the preferred
         way forward.
      
       - The system.h split introduced a bug in llist.h for arches using
         asm-generic/cmpxchg.h directly, which is currently only OpenRISC.
         The patch here moves two defines from asm-generic/atomic.h to
         asm-generic/cmpxchg.h to make things work as they should.
      
       - The VIRT_TO_BUS selector was added for OpenRISC, but OpenRISC does
         not have the virt_to_bus methods, so there's a patch to remove it
         again.
      
      * tag 'for-3.9-rc3' of git://openrisc.net/jonas/linux:
        openrisc: remove HAVE_VIRT_TO_BUS
        asm-generic: move cmpxchg*_local defs to cmpxchg.h
        openrisc: require gpiolib
      23659587
    • Linus Torvalds's avatar
      Merge tag 'char-misc-3.9-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc · 9e1a0aab
      Linus Torvalds authored
      Pull char/misc fixes from Greg Kroah-Hartman:
       "Here are some tiny fixes for the w1 drivers and the final removal
        patch for getting rid of CONFIG_EXPERIMENTAL (all users of it are now
        gone from your tree, this just drops the Kconfig item itself.)
      
        All have been in the linux-next tree for a while"
      
      * tag 'char-misc-3.9-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
        final removal of CONFIG_EXPERIMENTAL
        w1: fix oops when w1_search is called from netlink connector
        w1-gpio: fix unused variable warning
        w1-gpio: remove erroneous __exit and __exit_p()
        ARM: w1-gpio: fix erroneous gpio requests
      9e1a0aab
    • Linus Torvalds's avatar
      Merge tag 'sound-3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · 5cd8846c
      Linus Torvalds authored
      Pull sound fixes from Takashi Iwai:
       "A collection of small fixes, as expected for the middle rc:
         - A couple of fixes for potential NULL dereferences and out-of-range
           array accesses revealed by static code parsers
         - A fix for the wrong error handling detected by trinity
         - A regression fix for missing audio on some MacBooks
         - CA0132 DSP loader fixes
         - Fix for EAPD control of IDT codecs on machines w/o speaker
         - Fix a regression in the HD-audio widget list parser code
         - Workaround for the NuForce UDH-100 USB audio"
      
      * tag 'sound-3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
        ALSA: hda - Fix missing EAPD/GPIO setup for Cirrus codecs
        sound: sequencer: cap array index in seq_chn_common_event()
        ALSA: hda/ca0132 - Remove extra setting of dsp_state.
        ALSA: hda/ca0132 - Check download state of DSP.
        ALSA: hda/ca0132 - Check if dspload_image succeeded.
        ALSA: hda - Disable IDT eapd_switch if there are no internal speakers
        ALSA: hda - Fix snd_hda_get_num_raw_conns() to return a correct value
        ALSA: usb-audio: add a workaround for the NuForce UDH-100
        ALSA: asihpi - fix potential NULL pointer dereference
        ALSA: seq: Fix missing error handling in snd_seq_timer_open()
      5cd8846c
    • Linus Torvalds's avatar
      Merge branch 'fixes-for-3.9' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping · c7f17deb
      Linus Torvalds authored
      Pull DMA-mapping fix from Marek Szyprowski:
       "An important fix for all ARM architectures which use ZONE_DMA.
        Without it dma_alloc_* calls with GFP_ATOMIC flag might have allocated
        buffers outsize DMA zone."
      
      * 'fixes-for-3.9' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping:
        ARM: DMA-mapping: add missing GFP_DMA flag for atomic buffer allocation
      c7f17deb
    • Linus Torvalds's avatar
      Merge tag 'mfd-fixes-3.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-fixes · de1893f6
      Linus Torvalds authored
      Pull MFD fixes from Samuel Ortiz:
       "This is the first batch of MFD fixes for 3.9.
      
        With this one we have:
      
         - An ab8500 build failure fix.
         - An ab8500 device tree parsing fix.
         - A fix for twl4030_madc remove routine to work properly (when
           built-in).
         - A fix for properly registering palmas interrupt handler.
         - A fix for omap-usb init routine to actually write into the
           hostconfig register.
         - A couple of warning fixes for ab8500-gpadc and tps65912"
      
      * tag 'mfd-fixes-3.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-fixes:
        mfd: twl4030-madc: Remove __exit_p annotation
        mfd: ab8500: Kill "reg" property from binding
        mfd: ab8500-gpadc: Complain if we fail to enable vtvout LDO
        mfd: wm831x: Don't forward declare enum wm831x_auxadc
        mfd: twl4030-audio: Fix argument type for twl4030_audio_disable_resource()
        mfd: tps65912: Declare and use tps65912_irq_exit()
        mfd: palmas: Provide irq flags through DT/platform data
        mfd: Make AB8500_CORE select POWER_SUPPLY to fix build error
        mfd: omap-usb-host: Actually update hostconfig
      de1893f6
    • Linus Torvalds's avatar
      Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging · 92fbb1c9
      Linus Torvalds authored
      Pull hwmon fixes from Guenter Roeck:
       "Bug fixes for pmbus, ltc2978, and lineage-pem drivers
      
        Added specific maintainer for some hwmon drivers"
      
      * tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
        hwmon: (pmbus/ltc2978) Fix temperature reporting
        hwmon: (pmbus) Fix krealloc() misuse in pmbus_add_attribute()
        hwmon: (lineage-pem) Add missing terminating entry for pem_[input|fan]_attributes
        MAINTAINERS: Add maintainer for MAX6697, INA209, and INA2XX drivers
      92fbb1c9
  5. 15 Mar, 2013 12 commits