diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-06-05 11:55:27 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-06-05 11:55:27 -0700 |
commit | 5f73639c637be9efa60b8020df5a1d3cf295eec5 (patch) | |
tree | afa37073eb74dc0f72294b45c7288d37eb18ef37 /include/rdma | |
parent | 365f0e173f44aad979c464eb8250f6138a9911ef (diff) | |
parent | a4dff3043c231d57f982af635c9d2192ee40e5ae (diff) | |
download | kernel_goldelico_gta04-5f73639c637be9efa60b8020df5a1d3cf295eec5.zip kernel_goldelico_gta04-5f73639c637be9efa60b8020df5a1d3cf295eec5.tar.gz kernel_goldelico_gta04-5f73639c637be9efa60b8020df5a1d3cf295eec5.tar.bz2 |
Merge branch '3.5-merge-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
Pull two scsi target fixes from Nicholas Bellinger:
"The first is a small name-space collision fix from Stefan for the new
sbp-target / ieee-1394 code, and second is the FILEIO backend
conversion patch to always use O_DSYNC by default instead of O_SYNC as
recommended by hch. Note the latter is CC'ed stable."
* '3.5-merge-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending:
target/file: Use O_DSYNC by default for FILEIO backends
sbp-target: rename a variable to avoid name clash
Diffstat (limited to 'include/rdma')
0 files changed, 0 insertions, 0 deletions