summaryrefslogtreecommitdiff
path: root/net/netfilter
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-05-18 12:04:41 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2017-05-18 12:04:41 -0700
commit8b4822de59d5d9919b9b045183a36c673ce20b73 (patch)
treee7caba608a475448022a2ee0b509a157f7caae8b /net/netfilter
parent667f867c93d0117dec83bc5be9018d1a3a94044d (diff)
parentd82dd0e34d0347be201fd274dc84cd645dccc064 (diff)
Merge tag 'md/4.12-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/shli/md
Pull MD fixes from Shaohua Li: - Several bug fixes for raid5-cache from Song Liu, mainly handle journal disk error - Fix bad block handling in choosing raid1 disk from Tomasz Majchrzak - Simplify external metadata array sysfs handling from Artur Paszkiewicz - Optimize raid0 discard handling from me, now raid0 will dispatch large discard IO directly to underlayer disks. * tag 'md/4.12-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/shli/md: raid1: prefer disk without bad blocks md/r5cache: handle sync with data in write back cache md/r5cache: gracefully handle journal device errors for writeback mode md/raid1/10: avoid unnecessary locking md/raid5-cache: in r5l_do_submit_io(), submit io->split_bio first md/md0: optimize raid0 discard handling md: don't return -EAGAIN in md_allow_write for external metadata arrays md/raid5: make use of spin_lock_irq over local_irq_disable + spin_lock
Diffstat (limited to 'net/netfilter')
0 files changed, 0 insertions, 0 deletions