diff options
| author | David S. Miller <davem@davemloft.net> | 2017-10-22 13:36:53 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-10-22 13:39:14 +0100 |
| commit | f8ddadc4db6c7b7029b6d0e0d9af24f74ad27ca2 (patch) | |
| tree | 0a6432aba336bae42313613f4c891bcfce02bd4e /MAINTAINERS | |
| parent | bdd091bab8c631bd2801af838e344fad34566410 (diff) | |
| parent | b5ac3beb5a9f0ef0ea64cd85faf94c0dc4de0e42 (diff) | |
| download | linux-stable-f8ddadc4db6c7b7029b6d0e0d9af24f74ad27ca2.tar.gz linux-stable-f8ddadc4db6c7b7029b6d0e0d9af24f74ad27ca2.tar.bz2 linux-stable-f8ddadc4db6c7b7029b6d0e0d9af24f74ad27ca2.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
There were quite a few overlapping sets of changes here.
Daniel's bug fix for off-by-ones in the new BPF branch instructions,
along with the added allowances for "data_end > ptr + x" forms
collided with the metadata additions.
Along with those three changes came veritifer test cases, which in
their final form I tried to group together properly. If I had just
trimmed GIT's conflict tags as-is, this would have split up the
meta tests unnecessarily.
In the socketmap code, a set of preemption disabling changes
overlapped with the rename of bpf_compute_data_end() to
bpf_compute_data_pointers().
Changes were made to the mv88e6060.c driver set addr method
which got removed in net-next.
The hyperv transport socket layer had a locking change in 'net'
which overlapped with a change of socket state macro usage
in 'net-next'.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index f218fe1e43fe..e3a7ca9d2783 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5351,9 +5351,7 @@ M: "J. Bruce Fields" <bfields@fieldses.org> L: linux-fsdevel@vger.kernel.org S: Maintained F: include/linux/fcntl.h -F: include/linux/fs.h F: include/uapi/linux/fcntl.h -F: include/uapi/linux/fs.h F: fs/fcntl.c F: fs/locks.c @@ -5362,6 +5360,8 @@ M: Alexander Viro <viro@zeniv.linux.org.uk> L: linux-fsdevel@vger.kernel.org S: Maintained F: fs/* +F: include/linux/fs.h +F: include/uapi/linux/fs.h FINTEK F75375S HARDWARE MONITOR AND FAN CONTROLLER DRIVER M: Riku Voipio <riku.voipio@iki.fi> @@ -7576,7 +7576,7 @@ F: arch/mips/include/asm/kvm* F: arch/mips/kvm/ KERNEL VIRTUAL MACHINE FOR POWERPC (KVM/powerpc) -M: Alexander Graf <agraf@suse.com> +M: Paul Mackerras <paulus@ozlabs.org> L: kvm-ppc@vger.kernel.org W: http://www.linux-kvm.org/ T: git git://github.com/agraf/linux-2.6.git |