aboutsummaryrefslogtreecommitdiffstats
path: root/net/netfilter
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2019-02-15 09:12:28 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2019-02-15 09:12:28 -0800
commit24f0a48743a256bdec1bcb80708bc309da4aa261 (patch)
treeb3211465a2c59f56587c052b70ccd587d60d7f1e /net/netfilter
parentMerge tag 'for-5.0/dm-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm (diff)
parentMerge branch 'nvme-5.0' of git://git.infradead.org/nvme into for-linus (diff)
downloadlinux-dev-24f0a48743a256bdec1bcb80708bc309da4aa261.tar.xz
linux-dev-24f0a48743a256bdec1bcb80708bc309da4aa261.zip
Merge tag 'for-linus-20190215' of git://git.kernel.dk/linux-block
Pull block fixes from Jens Axboe: - Ensure we insert into the hctx dispatch list, if a request is marked as DONTPREP (Jianchao) - NVMe pull request, single missing unlock on error fix (Keith) - MD pull request, single fix for a potentially data corrupting issue (Nate) - Floppy check_events regression fix (Yufen) * tag 'for-linus-20190215' of git://git.kernel.dk/linux-block: md/raid1: don't clear bitmap bits on interrupted recovery. floppy: check_events callback should not return a negative number nvme-pci: add missing unlock for reset error blk-mq: insert rq with DONTPREP to hctx dispatch list when requeue
Diffstat (limited to 'net/netfilter')
0 files changed, 0 insertions, 0 deletions