summaryrefslogtreecommitdiffstats
path: root/net/ipv6/netfilter/nf_conntrack_reasm.c
diff options
context:
space:
mode:
authorLinus Torvalds2019-08-18 21:56:42 +0200
committerLinus Torvalds2019-08-18 21:56:42 +0200
commit6825e5a6c45dbd473f8b2993a065bbea15347632 (patch)
tree52df289d9f503f2c378e74d32abde8dd96f3a866 /net/ipv6/netfilter/nf_conntrack_reasm.c
parentMerge tag 'for-5.3-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff)
parentmtd: spi-nor: Fix the disabling of write protection at init (diff)
downloadkernel-qcow2-linux-6825e5a6c45dbd473f8b2993a065bbea15347632.tar.gz
kernel-qcow2-linux-6825e5a6c45dbd473f8b2993a065bbea15347632.tar.xz
kernel-qcow2-linux-6825e5a6c45dbd473f8b2993a065bbea15347632.zip
Merge tag 'fixes-for-5.3-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux
Pull MTD fix from Richard Weinberger: "A single fix for MTD to correctly set the spi-nor WP pin" * tag 'fixes-for-5.3-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux: mtd: spi-nor: Fix the disabling of write protection at init
Diffstat (limited to 'net/ipv6/netfilter/nf_conntrack_reasm.c')
0 files changed, 0 insertions, 0 deletions