diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-27 22:21:40 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-27 22:21:40 +0200 |
| commit | 91d41fdf31f74e6e2e5f3cb018eca4200e36e202 (patch) | |
| tree | 81ef11f06bd8047031a2d93706dc263fa1bacd56 /fs/nfs | |
| parent | signals: sys_ssetmask/sys_rt_sigsuspend should use set_current_blocked() (diff) | |
| parent | target: Convert to DIV_ROUND_UP_SECTOR_T usage for sectors / dev_max_sectors (diff) | |
| download | linux-91d41fdf31f74e6e2e5f3cb018eca4200e36e202.tar.xz linux-91d41fdf31f74e6e2e5f3cb018eca4200e36e202.zip | |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending:
target: Convert to DIV_ROUND_UP_SECTOR_T usage for sectors / dev_max_sectors
kernel.h: Add DIV_ROUND_UP_ULL and DIV_ROUND_UP_SECTOR_T macro usage
iscsi-target: Add iSCSI fabric support for target v4.1
iscsi: Add Serial Number Arithmetic LT and GT into iscsi_proto.h
iscsi: Use struct scsi_lun in iscsi structs instead of u8[8]
iscsi: Resolve iscsi_proto.h naming conflicts with drivers/target/iscsi
Diffstat (limited to 'fs/nfs')
0 files changed, 0 insertions, 0 deletions