]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
Merge remote-tracking branch 'pidfd-fixes/fixes'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 2 Jun 2021 23:12:26 +0000 (09:12 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 2 Jun 2021 23:12:26 +0000 (09:12 +1000)
1  2 
fs/file.c

diff --cc fs/file.c
Simple merge