diff options
| author | David S. Miller <davem@davemloft.net> | 2018-10-19 20:03:06 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-10-19 20:03:06 +0200 |
| commit | 2e2d6f0342be7f73a34526077fa96f42f0e8c661 (patch) | |
| tree | 29f3740825a70aa606e03cf3a048d9a3a751529c /MAINTAINERS | |
| parent | rocker: Drop pointless static qualifier (diff) | |
| parent | Revert "bond: take rcu lock in netpoll_send_skb_on_dev" (diff) | |
| download | linux-2e2d6f0342be7f73a34526077fa96f42f0e8c661.tar.xz linux-2e2d6f0342be7f73a34526077fa96f42f0e8c661.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
net/sched/cls_api.c has overlapping changes to a call to
nlmsg_parse(), one (from 'net') added rtm_tca_policy instead of NULL
to the 5th argument, and another (from 'net-next') added cb->extack
instead of NULL to the 6th argument.
net/ipv4/ipmr_base.c is a case of a bug fix in 'net' being done to
code which moved (to mr_table_dump)) in 'net-next'. Thanks to David
Ahern for the heads up.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index a3e46109ceb2..e0eb8ec08789 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -10161,7 +10161,6 @@ L: netdev@vger.kernel.org T: git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git T: git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git S: Maintained -F: net/core/flow.c F: net/xfrm/ F: net/key/ F: net/ipv4/xfrm* @@ -13101,7 +13100,7 @@ SELINUX SECURITY MODULE M: Paul Moore <paul@paul-moore.com> M: Stephen Smalley <sds@tycho.nsa.gov> M: Eric Paris <eparis@parisplace.org> -L: selinux@tycho.nsa.gov (moderated for non-subscribers) +L: selinux@vger.kernel.org W: https://selinuxproject.org W: https://github.com/SELinuxProject T: git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git |