]> www.infradead.org Git - users/willy/linux.git/commitdiff
projects / users / willy / linux.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9ccce09 42eb0d5)
Merge branch 'work.file' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 3 May 2021 18:05:28 +0000 (11:05 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 3 May 2021 18:05:28 +0000 (11:05 -0700)
Pull receive_fd update from Al Viro:
 "Cleanup of receive_fd mess"

* 'work.file' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  fs: split receive_fd_replace from __receive_fd

1  2 
fs/file.c patch | diff1 | diff2 | blob | history
kernel/seccomp.c patch | diff1 | diff2 | blob | history

diff --cc fs/file.c
Simple merge
diff --cc kernel/seccomp.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.