- 07 3月, 2013 21 次提交
-
-
由 Rabin Vincent 提交于
So we're removing support for it. Signed-off-by: NRabin Vincent <rabin.vincent@stericsson.com> Signed-off-by: NLee Jones <lee.jones@linaro.org> Tested-by: NMarcus COOPER <marcus.xm.cooper@stericsson.com> Acked-by: NSamuel Ortiz <sameo@linux.intel.com>
-
由 Lee Jones 提交于
Add VBUS_DET_R, VBUS_DET_F IRQ, ID_DET_PLUGR and ID_DET_PLUGF IRQ information to ab8505_iddet_resources. These are required to get interrupts for AB8505 cut-2. Signed-off-by: NLee Jones <lee.jones@linaro.org> Acked-by: NSamuel Ortiz <sameo@linux.intel.com>
-
由 Lee Jones 提交于
Optimise GPADC driver: * for code readability and maintenance by grouping similar cheking * for performance by grouping several writing to control register Signed-off-by: NAlexandre Bourdiol <alexandre.bourdiol@stericsson.com> Signed-off-by: NLee Jones <lee.jones@linaro.org> Reviewed-by: NPhilippe LANGLAIS <philippe.langlais@stericsson.com> Acked-by: NSamuel Ortiz <sameo@linux.intel.com>
-
由 Lee Jones 提交于
Allow GPADC debug information to be shown when executing on an AB8540 based platform. Signed-off-by: NAlexandre Bourdiol <alexandre.bourdiol@stericsson.com> Reviewed-by: NMarcus COOPER <marcus.xm.cooper@stericsson.com> Reviewed-by: NPhilippe LANGLAIS <philippe.langlais@stericsson.com> Acked-by: NSamuel Ortiz <sameo@linux.intel.com>
-
由 Lee Jones 提交于
This patch enables the GPADC to work on AB8540 based platforms. Signed-off-by: NLee Jones <lee.jones@linaro.org> Acked-by: NSamuel Ortiz <sameo@linux.intel.com>
-
由 Lee Jones 提交于
Add a new reset function which uses the AB WD with 0 timeout. Signed-off-by: NLee Jones <lee.jones@linaro.org> Acked-by: NSamuel Ortiz <sameo@linux.intel.com>
-
由 Lee Jones 提交于
Make it possible to dump all registers in ab8505 and ab9540. Signed-off-by: NLee Jones <lee.jones@linaro.org> Acked-by: NSamuel Ortiz <sameo@linux.intel.com>
-
由 Lee Jones 提交于
Signed-off-by: NAlexandre Torgue <alexandre.torgue@stericsson.com> Signed-off-by: NLee Jones <lee.jones@linaro.org> Reviewed-by: NMarcus COOPER <marcus.xm.cooper@stericsson.com> Reviewed-by: NMattias WALLIN <mattias.wallin@stericsson.com> Tested-by: NMaxime COQUELIN <maxime.coquelin@stericsson.com> Acked-by: NSamuel Ortiz <sameo@linux.intel.com>
-
由 Marcus Danielsson 提交于
Add error checks to see if sysctrl was probed as it should. If the sysctrl_dev is not set the return value is -EINVAL. Signed-off-by: NMarcus Danielsson <marcus.danielsson@stericsson.com> Signed-off-by: NLee Jones <lee.jones@linaro.org> Reviewed-by: NMattias WALLIN <mattias.wallin@stericsson.com> Tested-by: NPer FORLIN <per.forlin@stericsson.com> Acked-by: NSamuel Ortiz <sameo@linux.intel.com>
-
由 Jonas Aaberg 提交于
Add information regarding what ab interrupt that caused a wake-up from suspend in <debugfs>/ab8500/interrupts. Also print the name of the interrupts, not just the numbers. Signed-off-by: NJonas Aaberg <jonas.aberg@stericsson.com> Signed-off-by: NLee Jones <lee.jones@linaro.org> Reviewed-by: NPer FORLIN <per.forlin@stericsson.com> Tested-by: NMattias WALLIN <mattias.wallin@stericsson.com> Acked-by: NSamuel Ortiz <sameo@linux.intel.com>
-
由 Jonas Aaberg 提交于
Stop trying to read i2c registers if one fail. Signed-off-by: NJonas Aaberg <jonas.aberg@stericsson.com> Signed-off-by: NLee Jones <lee.jones@linaro.org> Reviewed-by: NMattias WALLIN <mattias.wallin@stericsson.com> Acked-by: NSamuel Ortiz <sameo@linux.intel.com>
-
由 Lee Jones 提交于
ITSource/ITLatch 7, 8, 9 and 10 don't exist on AB8540. This patch replaces them with '-1' in the interrupt list, and handles the '-1' in the code accordingly. Signed-off-by: NLee Jones <lee.jones@linaro.org> Acked-by: NSamuel Ortiz <sameo@linux.intel.com>
-
由 Lee Jones 提交于
Here we're separating Battery Management devices into their own structure, removing the common device structure & redistribute them amongst the individual platform structs and completing the population of them. Signed-off-by: NLee Jones <lee.jones@linaro.org> Acked-by: NSamuel Ortiz <sameo@linux.intel.com>
-
由 Lee Jones 提交于
Signed-off-by: NLee Jones <lee.jones@linaro.org> Acked-by: NSamuel Ortiz <sameo@linux.intel.com>
-
由 Lee Jones 提交于
Dump function that stores all readable ABB registers to a memory areas where they can be accessed from dump file. Signed-off-by: NJonas Aaberg <jonas.aberg@stericsson.com> Signed-off-by: NLee Jones <lee.jones@linaro.org> Reviewed-by: NMattias WALLIN <mattias.wallin@stericsson.com> Acked-by: NSamuel Ortiz <sameo@linux.intel.com>
-
由 Mattias Wallin 提交于
This patch changes bank prints to use hex value. Signed-off-by: NMattias Wallin <mattias.wallin@stericsson.com> Signed-off-by: NLee Jones <lee.jones@linaro.org> Reviewed-by: NMarcus COOPER <marcus.xm.cooper@stericsson.com> Reviewed-by: NDaniel WILLERUD <daniel.willerud@stericsson.com> Tested-by: NJonas ABERG <jonas.aberg@stericsson.com> Acked-by: NSamuel Ortiz <sameo@linux.intel.com>
-
由 Lee Jones 提交于
There are missing register descriptions from the AB8505 user manual and these need to be masked so that the APEINT line can toggle. This patch also affects the behaviour of AB9540. Signed-off-by: NMarcus Cooper <marcus.xm.cooper@stericsson.com> Signed-off-by: NLee Jones <lee.jones@linaro.org> Reviewed-by: NMaxime COQUELIN <maxime.coquelin@stericsson.com> Reviewed-by: NAlexandre TORGUE <alexandre.torgue@stericsson.com> Reviewed-by: NMattias WALLIN <mattias.wallin@stericsson.com> Acked-by: NSamuel Ortiz <sameo@linux.intel.com>
-
由 Lee Jones 提交于
Add the support of gpacd hw conversion and make the number of sample configurable. Signed-off-by: NM'boumba Cedric Madianga <cedric.madianga@stericsson.com> Signed-off-by: NLee Jones <lee.jones@linaro.org> Reviewed-by: NMattias WALLIN <mattias.wallin@stericsson.com> Tested-by: NMichel JAOUEN <michel.jaouen@stericsson.com> Acked-by: NSamuel Ortiz <sameo@linux.intel.com>
-
由 Jonas Aaberg 提交于
Reread the gpadc once upon failure. Signed-off-by: NJonas Aaberg <jonas.aberg@stericsson.com> Signed-off-by: NLee Jones <lee.jones@linaro.org> Reviewed-by: NMattias WALLIN <mattias.wallin@stericsson.com> Acked-by: NSamuel Ortiz <sameo@linux.intel.com>
-
由 Daniel WILLERUD 提交于
suspend/resume methods implemented to prevent suspend while the gpadc driver is busy. Signed-off-by: NDaniel WILLERUD <daniel.willerud@stericsson.com> Signed-off-by: NLee Jones <lee.jones@linaro.org> Reviewed-by: NJonas ABERG <jonas.aberg@stericsson.com> Reviewed-by: NUlf HANSSON <ulf.hansson@stericsson.com> Acked-by: NSamuel Ortiz <sameo@linux.intel.com>
-
由 Rajkumar Kasirajan 提交于
In L9540, turn_on_status register is not updated correctly if the device is rebooted with AC/USB charger connected. Due to this, the device boots android instead of entering into charge only mode. Read the AC/USB status register to detect the charger presence and update the turn on status manually. Signed-off-by: NRajkumar Kasirajan <rajkumar.kasirajan@stericsson.com> Signed-off-by: NPer Forlin <per.forlin@stericsson.com> Signed-off-by: NLee Jones <lee.jones@linaro.org> Reviewed-by: NRupesh KUMAR <rupesh.kumar@stericsson.com> Reviewed-by: NPhilippe LANGLAIS <philippe.langlais@stericsson.com> Tested-by: NRupesh KUMAR <rupesh.kumar@stericsson.com> Tested-by: NPhilippe LANGLAIS <philippe.langlais@stericsson.com> Acked-by: NSamuel Ortiz <sameo@linux.intel.com>
-
- 04 3月, 2013 14 次提交
-
-
由 Linus Torvalds 提交于
-
git://git.infradead.org/users/dhowells/linux-headers由 Linus Torvalds 提交于
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
-
由 Linus Torvalds 提交于
Merge tag 'stable/for-linus-3.9-rc1-tag' of git://git.kernel.org/pub/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
-
git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs由 Linus Torvalds 提交于
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)
-
git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs由 Linus Torvalds 提交于
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>
-
git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux由 Linus Torvalds 提交于
Pull second set of s390 patches from Martin Schwidefsky: "The main part of this merge are Heikos uaccess patches. Together with commit 09884964 ("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
-
由 Linus Torvalds 提交于
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
-
git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag由 Linus Torvalds 提交于
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() ...
-
git://git.linaro.org/people/rmk/linux-arm由 Linus Torvalds 提交于
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
-
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc由 Linus Torvalds 提交于
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: NGreg 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
-
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb由 Linus Torvalds 提交于
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"
-
git://www.linux-watchdog.org/linux-watchdog由 Linus Torvalds 提交于
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 ...
-
git://git.infradead.org/users/vkoul/slave-dma由 Linus Torvalds 提交于
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()
-
git://cavan.codon.org.uk/platform-drivers-x86由 Linus Torvalds 提交于
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 ...
-
- 03 3月, 2013 5 次提交
-
-
由 Geert Uytterhoeven 提交于
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: NGeert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: NChris Mason <chris.mason@fusionio.com>
-
git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4由 Linus Torvalds 提交于
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()
-
git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal由 Linus Torvalds 提交于
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()
-
由 Al Viro 提交于
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: NAl Viro <viro@zeniv.linux.org.uk>
-
git://git.linux-nfs.org/projects/trondmy/linux-nfs由 Linus Torvalds 提交于
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
-