summaryrefslogtreecommitdiff
path: root/Misc
diff options
context:
space:
mode:
authorVadim Kochan <vadim4j@gmail.com>2015-05-07 13:19:17 +0300
committerDaniel Borkmann <daniel@iogearbox.net>2015-05-07 13:38:21 +0200
commitb1c259466e5d18c35043898bdbab7b636fa0b8b2 (patch)
tree123d533583d59feaf37dec0c469faaed856b5e45 /Misc
parentd9432291168e7e15877bdd4c1c23ed0dc8913246 (diff)
authors: Fix Daniel's email
Use actual Daniel's <daniel@iogearbox.net> email. Signed-off-by: Vadim Kochan <vadim4j@gmail.com> [ -dbkm: also moved Tobias one up while we're at it as he got more contribs ] Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Diffstat (limited to 'Misc')
0 files changed, 0 insertions, 0 deletions
/net/mac80211/key.h?h=nds-private-remove&id=c14024dbb156c8392908aaa822097d27c6af8ec8'>c14024dbb156c8392908aaa822097d27c6af8ec8 (diff)
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
Pull block fixes from Jens Axboe: "A set of fixes for this series. This contains: - Set of fixes for the nvme target code - A revert of patch from this merge window, causing a regression with WRITE_SAME on iSCSI targets at least. - A fix for a use-after-free in the new O_DIRECT bdev code. - Two fixes for the xen-blkfront driver" * 'for-linus' of git://git.kernel.dk/linux-block: Revert "sd: remove __data_len hack for WRITE SAME" nvme-fc: use blk_rq_nr_phys_segments nvmet-rdma: Fix missing dma sync to nvme data structures nvmet: Call fatal_error from keep-alive timout expiration nvmet: cancel fatal error and flush async work before free controller nvmet: delete controllers deletion upon subsystem release nvmet_fc: correct logic in disconnect queue LS handling block: fix use after free in __blkdev_direct_IO xen-blkfront: correct maximum segment accounting xen-blkfront: feature flags handling adjustments
Diffstat (limited to 'net/mac80211/key.h')