Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (43 commits) staging: slicoss: update README otus/zdusb.c: additional USB idnetifier Staging: go7007: fix build issues Staging: sxg: Fix leaks and checksum errors in transmit code path Staging: sxg: Fix sleep in atomic context warning while loading driver Staging: sxg: Use correct queue_id for transmitting non-TCP packets Staging: sxg: Fire watchdog timer at end of open routine to change the link Staging: Pohmelfs: Add load balancing between network states with the same priority. Staging: Pohmelfs: Added IO permissions and priorities. Staging: Pohmelfs: Added ->show_stats() callback. Staging: Pohmelfs: Drop ftrans debugging code. Staging: Pohmelfs: Use wait_on_page_timeout when waiting for remote directory sync instead of hardcoded 25 seconds. Staging: Pohmelfs: Reduce debugging noise about non-existing objects. Staging: Pohmelfs: Sync fs before killing it, since dentry cache is shrunk before writeback is invoked via generic_shutdown_super() Staging: Pohmelfs: Extend remount option. Staging: Pohmelfs: Set NETFS_INODE_REMOTE_SYNCED and clear NETFS_INODE_OWNED bits in the root inode. Staging: Pohmelfs: Added 'need_lock' variable into debug print. Staging: Pohmelfs: Disable read lock in pohmelfs_getattr(). Staging: Pohmelfs: Move parent lock to the place where we really have to send a lookup request to the server. Staging: pohmelfs: Populate dentry cache when receiving the new readdir entry. ...
No related branches found
No related tags found
Showing
- Documentation/filesystems/pohmelfs/design_notes.txt 3 additions, 2 deletionsDocumentation/filesystems/pohmelfs/design_notes.txt
- Documentation/filesystems/pohmelfs/info.txt 17 additions, 4 deletionsDocumentation/filesystems/pohmelfs/info.txt
- drivers/staging/android/binder.c 152 additions, 49 deletionsdrivers/staging/android/binder.c
- drivers/staging/at76_usb/at76_usb.c 13 additions, 7 deletionsdrivers/staging/at76_usb/at76_usb.c
- drivers/staging/epl/VirtualEthernetLinux.c 12 additions, 5 deletionsdrivers/staging/epl/VirtualEthernetLinux.c
- drivers/staging/et131x/et131x_netdev.c 14 additions, 9 deletionsdrivers/staging/et131x/et131x_netdev.c
- drivers/staging/go7007/go7007-driver.c 0 additions, 15 deletionsdrivers/staging/go7007/go7007-driver.c
- drivers/staging/go7007/wis-sony-tuner.c 2 additions, 0 deletionsdrivers/staging/go7007/wis-sony-tuner.c
- drivers/staging/line6/audio.c 5 additions, 4 deletionsdrivers/staging/line6/audio.c
- drivers/staging/otus/usbdrv.c 29 additions, 18 deletionsdrivers/staging/otus/usbdrv.c
- drivers/staging/otus/zdusb.c 2 additions, 1 deletiondrivers/staging/otus/zdusb.c
- drivers/staging/otus/zdusb.h 4 additions, 0 deletionsdrivers/staging/otus/zdusb.h
- drivers/staging/pohmelfs/config.c 56 additions, 5 deletionsdrivers/staging/pohmelfs/config.c
- drivers/staging/pohmelfs/dir.c 12 additions, 12 deletionsdrivers/staging/pohmelfs/dir.c
- drivers/staging/pohmelfs/inode.c 106 additions, 31 deletionsdrivers/staging/pohmelfs/inode.c
- drivers/staging/pohmelfs/lock.c 2 additions, 1 deletiondrivers/staging/pohmelfs/lock.c
- drivers/staging/pohmelfs/net.c 18 additions, 54 deletionsdrivers/staging/pohmelfs/net.c
- drivers/staging/pohmelfs/netfs.h 10 additions, 11 deletionsdrivers/staging/pohmelfs/netfs.h
- drivers/staging/pohmelfs/trans.c 11 additions, 22 deletionsdrivers/staging/pohmelfs/trans.c
- drivers/staging/rt2860/rt_main_dev.c 15 additions, 10 deletionsdrivers/staging/rt2860/rt_main_dev.c
Loading
Please register or sign in to comment