1. 03 Mar, 2013 15 commits
    • Linus Torvalds's avatar
      Merge branch 'fixes-for-3.9-latest' of... · 6977c6fc
      Linus Torvalds authored
      Merge branch 'fixes-for-3.9-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux
      
      Pull second round of PARISC updates from Helge Deller:
       "The most important fix in this branch is the switch of io_setup,
        io_getevents and io_submit syscalls to use the available compat
        syscalls when running 32bit userspace on 64bit kernel.  Other than
        that it's mostly removal of compile warnings."
      
      * 'fixes-for-3.9-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
        parisc: fix redefinition of SET_PERSONALITY
        parisc: do not install modules when installing kernel
        parisc: fix compile warnings triggered by atomic_sub(sizeof(),v)
        parisc: check return value of down_interruptible() in hp_sdc_rtc.c
        parisc: avoid unitialized variable warning in pa_memcpy()
        parisc: remove unused variable 'compat_val'
        parisc: switch to compat_functions of io_setup, io_getevents and io_submit
        parisc: select ARCH_WANT_FRAME_POINTERS
      6977c6fc
    • Linus Torvalds's avatar
      Merge tag 'metag-v3.9-rc1-v4' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag · 8fd5e7a2
      Linus Torvalds authored
      Pull new ImgTec Meta architecture from James Hogan:
       "This adds core architecture support for Imagination's Meta processor
        cores, followed by some later miscellaneous arch/metag cleanups and
        fixes which I kept separate to ease review:
      
         - Support for basic Meta 1 (ATP) and Meta 2 (HTP) core architecture
         - A few fixes all over, particularly for symbol prefixes
         - A few privilege protection fixes
         - Several cleanups (setup.c includes, split out a lot of
           metag_ksyms.c)
         - Fix some missing exports
         - Convert hugetlb to use vm_unmapped_area()
         - Copy device tree to non-init memory
         - Provide dma_get_sgtable()"
      
      * tag 'metag-v3.9-rc1-v4' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag: (61 commits)
        metag: Provide dma_get_sgtable()
        metag: prom.h: remove declaration of metag_dt_memblock_reserve()
        metag: copy devicetree to non-init memory
        metag: cleanup metag_ksyms.c includes
        metag: move mm/init.c exports out of metag_ksyms.c
        metag: move usercopy.c exports out of metag_ksyms.c
        metag: move setup.c exports out of metag_ksyms.c
        metag: move kick.c exports out of metag_ksyms.c
        metag: move traps.c exports out of metag_ksyms.c
        metag: move irq enable out of irqflags.h on SMP
        genksyms: fix metag symbol prefix on crc symbols
        metag: hugetlb: convert to vm_unmapped_area()
        metag: export clear_page and copy_page
        metag: export metag_code_cache_flush_all
        metag: protect more non-MMU memory regions
        metag: make TXPRIVEXT bits explicit
        metag: kernel/setup.c: sort includes
        perf: Enable building perf tools for Meta
        metag: add boot time LNKGET/LNKSET check
        metag: add __init to metag_cache_probe()
        ...
      8fd5e7a2
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm · 529e5fbc
      Linus Torvalds authored
      Pull late ARM updates from Russell King:
       "Here is the late set of ARM updates for this merge window; in here is:
      
         - The ARM parts of the broadcast timer support, core parts merged
           through tglx's tree.  This was left over from the previous merge to
           allow the dependency on tglx's tree to be resolved.
      
         - A fix to the VFP code which shows up on Raspberry Pi's, as well as
           fixing the fallout from a previous commit in this area.
      
         - A number of smaller fixes scattered throughout the ARM tree"
      
      * 'for-linus' of git://git.linaro.org/people/rmk/linux-arm:
        ARM: Fix broken commit 0cc41e4a corrupting kernel messages
        ARM: fix scheduling while atomic warning in alignment handling code
        ARM: VFP: fix emulation of second VFP instruction
        ARM: 7656/1: uImage: Error out on build of multiplatform without LOADADDR
        ARM: 7640/1: memory: tegra_ahb_enable_smmu() depends on TEGRA_IOMMU_SMMU
        ARM: 7654/1: Preserve L_PTE_VALID in pte_modify()
        ARM: 7653/2: do not scale loops_per_jiffy when using a constant delay clock
        ARM: 7651/1: remove unused smp_timer_broadcast #define
      529e5fbc
    • Linus Torvalds's avatar
      Merge tag 'char-misc-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc · 686c0940
      Linus Torvalds authored
      Pull char/misc patch from Greg Kroah-Hartman:
       "Here is one remaining patch for 3.9-rc1.  It is for the hyper-v
        drivers, and had to wait until some other patches went in through the
        x86 tree."
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      
      * tag 'char-misc-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
        Drivers: hv: vmbus: Use the new infrastructure for delivering VMBUS interrupts
      686c0940
    • Linus Torvalds's avatar
      Merge tag 'usb-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb · bc2e4a90
      Linus Torvalds authored
      Pull USB patch revert from Greg Kroah-Hartman:
       "Here is one remaining USB patch for 3.9-rc1, it reverts a 3.8 patch
        that has caused a lot of regressions for some VIA EHCI controllers."
      
      * tag 'usb-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
        USB: EHCI: revert "remove ASS/PSS polling timeout"
      bc2e4a90
    • Linus Torvalds's avatar
      Merge git://www.linux-watchdog.org/linux-watchdog · 68b86a25
      Linus Torvalds authored
      Pull watchdog updates from Wim Van Sebroeck:
       "This contains:
         - fixes and improvements
         - devicetree bindings
         - conversion to watchdog generic framework of the following drivers:
              - booke_wdt
              - bcm47xx_wdt.c
              - at91sam9_wdt
         - Removal of old STMP3xxx driver
         - Addition of following new drivers:
              - new driver for STMP3xxx and i.MX23/28
              - Retu watchdog driver"
      
      * git://www.linux-watchdog.org/linux-watchdog: (30 commits)
        watchdog: sp805_wdt depends on ARM
        watchdog: davinci_wdt: update to devm_* API
        watchdog: davinci_wdt: use devm managed clk get
        watchdog: at91rm9200: add DT support
        watchdog: add timeout-sec property binding
        watchdog: at91sam9_wdt: Convert to use the watchdog framework
        watchdog: omap_wdt: Add option nowayout
        watchdog: core: dt: add support for the timeout-sec dt property
        watchdog: bcm47xx_wdt.c: add hard timer
        watchdog: bcm47xx_wdt.c: rename wdt_time to timeout
        watchdog: bcm47xx_wdt.c: rename ops methods
        watchdog: bcm47xx_wdt.c: use platform device
        watchdog: bcm47xx_wdt.c: convert to watchdog core api
        watchdog: Convert BookE watchdog driver to watchdog infrastructure
        watchdog: s3c2410_wdt: Use devm_* functions
        watchdog: remove old STMP3xxx driver
        watchdog: add new driver for STMP3xxx and i.MX23/28
        rtc: stmp3xxx: add wdt-accessor function
        watchdog: introduce retu_wdt driver
        watchdog: intel_scu_watchdog: fix Kconfig dependency
        ...
      68b86a25
    • Linus Torvalds's avatar
      Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma · 527c680f
      Linus Torvalds authored
      Pull second set of slave-dmaengine updates from Vinod Koul:
       "Arnd's patch moves the dw_dmac to use generic DMA binding.  I agreed
        to merge this late as it will avoid the conflicts between trees.
      
        The second patch from Matt adding a dma_request_slave_channel_compat
        API was supposed to be picked up, but somehow never got picked up.
        Some patches dependent on this are already in -next :("
      
      * 'next' of git://git.infradead.org/users/vkoul/slave-dma:
        dmaengine: dw_dmac: move to generic DMA binding
        dmaengine: add dma_request_slave_channel_compat()
      527c680f
    • Linus Torvalds's avatar
      Merge branch 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86 · 23caaeea
      Linus Torvalds authored
      Pull x86 platform driver updates from Matthew Garrett:
       "Mostly relatively small updates, along with some hardware enablement
        for Sony hardware and a pile of updates to Google's Chromebook driver"
      
      * 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86: (49 commits)
        ideapad-laptop: Depend on BACKLIGHT_CLASS_DEVICE instead of selecting it
        ideapad: depends on backlight subsystem and update comment
        Platform: x86: chromeos_laptop - add i915 gmbuses to adapter names
        Platform: x86: chromeos_laptop - Add isl light sensor for Pixel
        Platform: x86: chromeos_laptop - Add a more general add_i2c_device
        Platform: x86: chromeos_laptop - Add Pixel Touchscreen
        Platform: x86: chromeos_laptop - Add support for probing devices
        Platform: x86: chromeos_laptop - Add Pixel Trackpad
        hp-wmi: fix handling of platform device
        sony-laptop: leak in error handling sony_nc_lid_resume_setup()
        hp-wmi: Add support for SMBus hotkeys
        asus-wmi: Fix unused function build warning
        acer-wmi: avoid the warning of 'devices' may be used uninitialized
        drivers/platform/x86/thinkpad_acpi.c: Handle HKEY event 0x6040
        Platform: x86: chromeos_laptop - Add HP Pavilion 14
        Platform: x86: chromeos_laptop - Add Taos tsl2583 device
        Platform: x86: chromeos_laptop - Add Taos tsl2563 device
        Platform: x86: chromeos_laptop - Add Acer C7 trackpad
        Platform: x86: chromeos_laptop - Rename setup_lumpy_tp to setup_cyapa_smbus_tp
        asus-laptop: always report brightness key events
        ...
      23caaeea
    • Linus Torvalds's avatar
      Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 · a7c1120d
      Linus Torvalds authored
      Pull ext4 bug fixes from Ted Ts'o:
       "Various bug fixes for ext4.  The most important is a fix for the new
        extent cache's slab shrinker which can cause significant, user-visible
        pauses when the system is under memory pressure."
      
      * tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
        ext4: enable quotas before orphan cleanup
        ext4: don't allow quota mount options when quota feature enabled
        ext4: fix a warning from sparse check for ext4_dir_llseek
        ext4: convert number of blocks to clusters properly
        ext4: fix possible memory leak in ext4_remount()
        jbd2: fix ERR_PTR dereference in jbd2__journal_start
        ext4: use percpu counter for extent cache count
        ext4: optimize ext4_es_shrink()
      a7c1120d
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal · 6ec40b42
      Linus Torvalds authored
      Pull sigprocmask compat fix from Al Viro:
       "generic compat_sys_rt_sigprocmask() had a very dumb braino; I'd spent
        quite a while staring at the offending commit before finally managing
        to spot the idiocy ;-/"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal:
        fix compat_sys_rt_sigprocmask()
      6ec40b42
    • Al Viro's avatar
      fix compat_sys_rt_sigprocmask() · db61ec29
      Al Viro authored
      Converting bitmask to 32bit granularity is fine, but we'd better
      _do_ something with the result.  Such as "copy it to userland"...
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
      db61ec29
    • Linus Torvalds's avatar
      Merge tag 'nfs-for-3.9-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs · 8d05b377
      Linus Torvalds authored
      Pull NFS client bugfixes from Trond Myklebust:
       "We've just concluded another Connectathon interoperability testing
        week, and so here are the fixes for the bugs that were discovered:
      
         - Don't allow NFS silly-renamed files to be deleted
         - Don't start the retransmission timer when out of socket space
         - Fix a couple of pnfs-related Oopses.
         - Fix one more NFSv4 state recovery deadlock
         - Don't loop forever when LAYOUTGET returns NFS4ERR_LAYOUTTRYLATER"
      
      * tag 'nfs-for-3.9-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
        SUNRPC: One line comment fix
        NFSv4.1: LAYOUTGET EDELAY loops timeout to the MDS
        SUNRPC: add call to get configured timeout
        PNFS: set the default DS timeout to 60 seconds
        NFSv4: Fix another open/open_recovery deadlock
        nfs: don't allow nfs_find_actor to match inodes of the wrong type
        NFSv4.1: Hold reference to layout hdr in layoutget
        pnfs: fix resend_to_mds for directio
        SUNRPC: Don't start the retransmission timer when out of socket space
        NFS: Don't allow NFS silly-renamed files to be deleted, no signal
      8d05b377
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs · b695188d
      Linus Torvalds authored
      Pull btrfs update from Chris Mason:
       "The biggest feature in the pull is the new (and still experimental)
        raid56 code that David Woodhouse started long ago.  I'm still working
        on the parity logging setup that will avoid inconsistent parity after
        a crash, so this is only for testing right now.  But, I'd really like
        to get it out to a broader audience to hammer out any performance
        issues or other problems.
      
        scrub does not yet correct errors on raid5/6 either.
      
        Josef has another pass at fsync performance.  The big change here is
        to combine waiting for metadata with waiting for data, which is a big
        latency win.  It is also step one toward using atomics from the
        hardware during a commit.
      
        Mark Fasheh has a new way to use btrfs send/receive to send only the
        metadata changes.  SUSE is using this to make snapper more efficient
        at finding changes between snapshosts.
      
        Snapshot-aware defrag is also included.
      
        Otherwise we have a large number of fixes and cleanups.  Eric Sandeen
        wins the award for removing the most lines, and I'm hoping we steal
        this idea from XFS over and over again."
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: (118 commits)
        btrfs: fixup/remove module.h usage as required
        Btrfs: delete inline extents when we find them during logging
        btrfs: try harder to allocate raid56 stripe cache
        Btrfs: cleanup to make the function btrfs_delalloc_reserve_metadata more logic
        Btrfs: don't call btrfs_qgroup_free if just btrfs_qgroup_reserve fails
        Btrfs: remove reduplicate check about root in the function btrfs_clean_quota_tree
        Btrfs: return ENOMEM rather than use BUG_ON when btrfs_alloc_path fails
        Btrfs: fix missing deleted items in btrfs_clean_quota_tree
        btrfs: use only inline_pages from extent buffer
        Btrfs: fix wrong reserved space when deleting a snapshot/subvolume
        Btrfs: fix wrong reserved space in qgroup during snap/subv creation
        Btrfs: remove unnecessary dget_parent/dput when creating the pending snapshot
        btrfs: remove a printk from scan_one_device
        Btrfs: fix NULL pointer after aborting a transaction
        Btrfs: fix memory leak of log roots
        Btrfs: copy everything if we've created an inline extent
        btrfs: cleanup for open-coded alignment
        Btrfs: do not change inode flags in rename
        Btrfs: use reserved space for creating a snapshot
        clear chunk_alloc flag on retryable failure
        ...
      b695188d
    • Linus Torvalds's avatar
      Merge tag 'for-linus-20130301' of git://git.infradead.org/linux-mtd · 48476df9
      Linus Torvalds authored
      Pull MTD update from David Woodhouse:
       "Fairly unexciting MTD merge for 3.9:
      
         - misc clean-ups in the MTD command-line partitioning parser
           (cmdlinepart)
         - add flash locking support for STmicro chips serial flash chips, as
           well as for CFI command set 2 chips.
         - new driver for the ELM error correction HW module found in various
           TI chips, enable the OMAP NAND driver to use the ELM HW error
           correction
         - added number of new serial flash IDs
         - various fixes and improvements in the gpmi NAND driver
         - bcm47xx NAND driver improvements
         - make the mtdpart module actually removable"
      
      * tag 'for-linus-20130301' of git://git.infradead.org/linux-mtd: (45 commits)
        mtd: map: BUG() in non handled cases
        mtd: bcm47xxnflash: use pr_fmt for module prefix in messages
        mtd: davinci_nand: Use managed resources
        mtd: mtd_torturetest can cause stack overflows
        mtd: physmap_of: Convert device allocation to managed devm_kzalloc()
        mtd: at91: atmel_nand: for PMECC, add code to check the ONFI parameter ECC requirement.
        mtd: atmel_nand: make pmecc-cap, pmecc-sector-size in dts is optional.
        mtd: atmel_nand: avoid to report an error when lookup table offset is 0.
        mtd: bcm47xxsflash: adjust names of bus-specific functions
        mtd: bcm47xxpart: improve probing of nvram partition
        mtd: bcm47xxpart: add support for other erase sizes
        mtd: bcm47xxnflash: register this as normal driver
        mtd: bcm47xxnflash: fix message
        mtd: bcm47xxsflash: register this as normal driver
        mtd: bcm47xxsflash: write number of written bytes
        mtd: gpmi: add sanity check for the ECC
        mtd: gpmi: set the Golois Field bit for mx6q's BCH
        mtd: devices: elm: Removes <xx> literals in elm DT node
        mtd: gpmi: fix a dereferencing freed memory error
        mtd: fix the wrong timeo for panic_nand_wait()
        ...
      48476df9
    • Russell King's avatar
  2. 02 Mar, 2013 25 commits