Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Mar 6, 2013
  1. mailbox: call request_irq after mbox queues are allocated

    authored
    The mailbox startup code is enabling the interrupt even before
    any of the associated mailbox queues are allocated. Any pending
    received mailbox message could cause a kernel panic as soon as
    the interrupt is enabled due to the dereferencing of non-existing
    mailbox queues within the ISR.
    
    Signed-off-by: Fernando Guzman Lugo <lugo.fernando@gmail.com>
    Signed-off-by: Suman Anna <s-anna@ti.com>
  2. mailbox: check for NULL nb in mailbox_put

    authored
    The mailbox_put function must check the notifier block for
    NULL before trying to unregister it.
    
    Signed-off-by: Fernando Guzman Lugo <lugo.fernando@gmail.com>
    Signed-off-by: Suman Anna <s-anna@ti.com>
  3. mailbox/omap: check iomem resource before dereferencing it

    authored
    Add a NULL check for iomem resource in mailbox probe functions.
    
    Signed-off-by: Fernando Guzman Lugo <lugo.fernando@gmail.com>
    Signed-off-by: Suman Anna <s-anna@ti.com>
  4. @ydrallap

    mailbox: create dbx500 mailbox driver

    ydrallap authored committed
    Add STEriccson DBX500 PRCM mailbox support.
    
    Signed-off-by: Loic Pallardy <loic.pallardy@st.com>
    Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
  5. @ydrallap

    mailbox: add no_irq send message

    ydrallap authored committed
    For debug purpose, mailbox must be available when
    interrupts are disabled to collect dump information.
    
    Signed-off-by: Loic Pallardy <loic.pallardy@st.com>
    Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
  6. @ydrallap

    mailbox: add IRQF_NO_SUSPEND flag

    ydrallap authored committed
    Coprocessor must be accessible during suspend transitions.
    
    Signed-off-by: Loic Pallardy <loic.pallardy@st.com>
    Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
  7. @ydrallap

    mailbox: add shared memory mailbox type

    ydrallap authored committed
    Some mailboxes are made up of cross interrupts
    and associated shared memory.
    Shared memory mapping is fixed and cross interrupt/shared
    memory relation make impossible the use of virtio.
    Mailbox framework must be enough opened to support
    any kind of mailbox.
    
    Signed-off-by: Loic Pallardy <loic.pallardy@st.com>
    Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
  8. @ydrallap

    mailbox: change protection mechanisms

    ydrallap authored committed
    TX: replace spin by mutex to release CPU
    during wait on mailbox resource.
    
    Signed-off-by: Loic Pallardy <loic.pallardy@st.com>
    Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
  9. @ydrallap

    mailbox: create opened message type

    ydrallap authored committed
    Current message type is a u32 to fit HW fifo format.
    This should be extended to support any message exchanges
    and type of mailbox.
    
    Proposed structure owns the original u32 and an optional
    pointer on additional data.
    
    Adaptations made to remoteproc and tidspbridge drivers.
    
    Signed-off-by: Loic Pallardy <loic.pallardy@st.com>
    Signed-off-by: Omar Ramirez Luna <omar.ramirez@copitl.com>
    Signed-off-by: Suman Anna <s-anna@ti.com>
    Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
  10. @ydrallap

    mailbox: rename omap_mbox in mailbox

    ydrallap authored committed
    In order to create a generic mailbox framework, functions
    and structures should be renamed in mailbox.
    
    Taking care of remoteproc and tidspbridge while at it.
    
    Signed-off-by: Loic Pallardy <loic.pallardy@st.com>
    Signed-off-by: Omar Ramirez Luna <omar.ramirez@copitl.com>
    Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
  11. mailbox: split internal header from API header

    Omar Ramirez Luna authored committed
    Now internal structures can remain hidden to the user and just API
    related functions and defines are made available.
    
    Signed-off-by: Omar Ramirez Luna <omar.luna@linaro.org>
    Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
  12. mailbox: OMAP: introduce mailbox framework

    Omar Ramirez Luna authored committed
    Actually moving it from plat-omap, as this framework/driver code is
    supposed to be under drivers/ folder. The framework should work with
    the current supported OMAP processors (OMAP1+) that have mailbox and
    can be used as a method of interprocessor communication.
    
    The mailbox hardware (in OMAP) uses a queued mailbox-interrupt mechanism
    that provides a communication channel between processors through a set of
    registers and their associated interrupt signals by sending and receiving
    messages.
    
    As part of the migration from plat and mach code:
    - Kconfig symbols have been renamed to build OMAP1 or OMAP2+ drivers.
    - mailbox.h has been changed from plat to a dedicated drivers/ folder.
    
    Module names have changed too, instead of mailbox_mach:
    - OMAP1: mailbox-omap1.ko
    - OMAP2+: mailbox-omap2.ko
    
    Signed-off-by: Omar Ramirez Luna <omar.luna@linaro.org>
    [s-anna@ti.com: Kconfig fixes for build errors]
    Signed-off-by: Suman Anna <s-anna@ti.com>
    Acked-by: Tony Lindgren <tony@atomide.com>
    Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
  13. ARM: OMAP2+: mbox: remove dependencies with soc.h

    authored
    The OMAP mailbox platform driver code has been cleaned up to
    remove the dependencies with soc.h in preparation for moving
    the mailbox code to drivers folder.
    
    The code relied on cpu_is_xxx/soc_is_xxx macros previously to
    pick the the right set of mailbox devices and register with the
    mailbox driver. This data is now represented in a concise format
    and moved to the respective omap_hwmod data files and published
    to the driver through the platform data.
    
    Signed-off-by: Suman Anna <s-anna@ti.com>
  14. ARM/highbank: rename pl320-ipc specific mailbox.h

    authored
    The patch 3005867 "ARM / highbank: add support for pl320 IPC"
    added a pl320 IPC specific header file as a generic mailbox.h.
    This file has been renamed appropriately to allow the
    introduction of the generic mailbox API framework.
    
    Signed-off-by: Suman Anna <s-anna@ti.com>
Commits on Mar 3, 2013
  1. @torvalds

    Linux 3.9-rc1

    torvalds authored
  2. @torvalds

    Merge tag 'disintegrate-fbdev-20121220' of git://git.infradead.org/us…

    torvalds authored
    …ers/dhowells/linux-headers
    
    Pull fbdev UAPI disintegration from David Howells:
     "You'll be glad to here that the end is nigh for the UAPI patches.
      Only the fbdev/framebuffer piece remains now that the SCSI stuff has
      gone in.
    
      Here are the UAPI disintegration bits for the fbdev drivers.  It
      appears that Florian hasn't had time to deal with my patch, but back
      in December he did say he didn't mind if I pushed it forward."
    
    Yay.  No more uapi movement.  And hopefully no more big header file
    cleanups coming up either, it just tends to be very painful.
    
    * tag 'disintegrate-fbdev-20121220' of git://git.infradead.org/users/dhowells/linux-headers:
      UAPI: (Scripted) Disintegrate include/video
  3. @torvalds

    Merge tag 'stable/for-linus-3.9-rc1-tag' of git://git.kernel.org/pub/…

    torvalds authored
    …scm/linux/kernel/git/konrad/xen
    
    Pull Xen bug-fixes from Konrad Rzeszutek Wilk:
     - Update the Xen ACPI memory and CPU hotplug locking mechanism.
     - Fix PAT issues wherein various applications would not start
     - Fix handling of multiple MSI as AHCI now does it.
     - Fix ARM compile failures.
    
    * tag 'stable/for-linus-3.9-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
      xenbus: fix compile failure on ARM with Xen enabled
      xen/pci: We don't do multiple MSI's.
      xen/pat: Disable PAT using pat_enabled value.
      xen/acpi: xen cpu hotplug minor updates
      xen/acpi: xen memory hotplug minor updates
  4. @torvalds

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds authored
    …/git/viro/vfs
    
    Pull  more VFS bits from Al Viro:
     "Unfortunately, it looks like xattr series will have to wait until the
      next cycle ;-/
    
      This pile contains 9p cleanups and fixes (races in v9fs_fid_add()
      etc), fixup for nommu breakage in shmem.c, several cleanups and a bit
      more file_inode() work"
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
      constify path_get/path_put and fs_struct.c stuff
      fix nommu breakage in shmem.c
      cache the value of file_inode() in struct file
      9p: if v9fs_fid_lookup() gets to asking server, it'd better have hashed dentry
      9p: make sure ->lookup() adds fid to the right dentry
      9p: untangle ->lookup() a bit
      9p: double iput() in ->lookup() if d_materialise_unique() fails
      9p: v9fs_fid_add() can't fail now
      v9fs: get rid of v9fs_dentry
      9p: turn fid->dlist into hlist
      9p: don't bother with private lock in ->d_fsdata; dentry->d_lock will do just fine
      more file_inode() open-coded instances
      selinux: opened file can't have NULL or negative ->f_path.dentry
    
    (In the meantime, the hlist traversal macros have changed, so this
    required a semantic conflict fixup for the newly hlistified fid->dlist)
  5. @torvalds

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds authored
    …/git/mason/linux-btrfs
    
    Pull btrfs fixup from Chris Mason:
     "Geert and James both sent this one in, sorry guys"
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
      btrfs/raid56: Add missing #include <linux/vmalloc.h>
  6. @torvalds

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds authored
    …/git/s390/linux
    
    Pull second set of s390 patches from Martin Schwidefsky:
     "The main part of this merge are Heikos uaccess patches.  Together with
      commit 0988496 ("mm: do not grow the stack vma just because of an
      overrun on preceding vma") the user string access is hopefully fixed
      for good.
    
      In addition some bug fixes and two cleanup patches."
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
      s390/module: fix compile warning
      qdio: remove unused parameters
      s390/uaccess: fix kernel ds access for page table walk
      s390/uaccess: fix strncpy_from_user string length check
      input: disable i8042 PC Keyboard controller for s390
      s390/dis: Fix invalid array size
      s390/uaccess: remove pointless access_ok() checks
      s390/uaccess: fix strncpy_from_user/strnlen_user zero maxlen case
      s390/uaccess: shorten strncpy_from_user/strnlen_user
      s390/dasd: fix unresponsive device after all channel paths were lost
      s390/mm: ignore change bit for vmemmap
      s390/page table dumper: add support for change-recording override bit
  7. @torvalds

    Merge branch 'fixes-for-3.9-latest' of git://git.kernel.org/pub/scm/l…

    torvalds authored
    …inux/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
  8. @torvalds

    Merge tag 'metag-v3.9-rc1-v4' of git://git.kernel.org/pub/scm/linux/k…

    torvalds authored
    …ernel/git/jhogan/metag
    
    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()
      ...
  9. @torvalds

    Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm

    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 0cc41e4 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
  10. @torvalds

    Merge tag 'char-misc-3.9-rc1' of git://git.kernel.org/pub/scm/linux/k…

    torvalds authored
    …ernel/git/gregkh/char-misc
    
    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: Greg 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
  11. @torvalds

    Merge tag 'usb-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/…

    torvalds authored
    …git/gregkh/usb
    
    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"
  12. @torvalds

    Merge git://www.linux-watchdog.org/linux-watchdog

    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
      ...
  13. @torvalds

    Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma

    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()
  14. @torvalds

    Merge branch 'for_linus' of git://cavan.codon.org.uk/platform-drivers…

    torvalds authored
    …-x86
    
    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
      ...
  15. @geertu

    btrfs/raid56: Add missing #include <linux/vmalloc.h>

    geertu authored Chris Mason committed
    tilegx_defconfig:
    
    fs/btrfs/raid56.c: In function 'btrfs_alloc_stripe_hash_table':
    fs/btrfs/raid56.c:206:3: error: implicit declaration of function 'vzalloc' [-Werror=implicit-function-declaration]
    fs/btrfs/raid56.c:206:9: warning: assignment makes pointer from integer without a cast [enabled by default]
    fs/btrfs/raid56.c:226:4: error: implicit declaration of function 'vfree' [-Werror=implicit-function-declaration]
    
    Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
    Signed-off-by: Chris Mason <chris.mason@fusionio.com>
  16. @torvalds

    Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kern…

    torvalds authored
    …el/git/tytso/ext4
    
    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()
  17. @torvalds

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds authored
    …/git/viro/signal
    
    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()
  18. fix compat_sys_rt_sigprocmask()

    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: Al Viro <viro@zeniv.linux.org.uk>
  19. @torvalds

    Merge tag 'nfs-for-3.9-2' of git://git.linux-nfs.org/projects/trondmy…

    torvalds authored
    …/linux-nfs
    
    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
  20. @torvalds

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds authored
    …/git/mason/linux-btrfs
    
    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
      ...
  21. @torvalds

    Merge tag 'for-linus-20130301' of git://git.infradead.org/linux-mtd

    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()
      ...
Something went wrong with that request. Please try again.