]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commit
projects / mirror_ubuntu-bionic-kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 91c8028 2a0c451)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Fri, 15 Jun 2012 22:51:55 +0000 (15:51 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 15 Jun 2012 22:51:55 +0000 (15:51 -0700)
commit7e52b33bd50faa866bc3e6e97e68438bc5e52251
tree46e68adf23f4f170a0eb5045c33a76234de6cf92tree
parent91c8028c95a468da9c0aafd2d91cf24e27784206commit | diff
parent2a0c451ade8e1783c5d453948289e4a978d417c9commit | diff
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Conflicts:
net/ipv6/route.c

This deals with a merge conflict between the net-next addition of the
inetpeer network namespace ops, and Thomas Graf's bug fix in
2a0c451ade8e1783c5d453948289e4a978d417c9 which makes sure we don't
register /proc/net/ipv6_route before it is actually safe to do so.

Signed-off-by: David S. Miller <davem@davemloft.net>
MAINTAINERS diff1 | diff2 | blob | history
drivers/net/can/c_can/c_can.c diff1 | diff2 | blob | history
drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c diff1 | diff2 | blob | history
include/net/ip6_fib.h diff1 | diff2 | blob | history
net/core/dev.c diff1 | diff2 | blob | history
net/ipv6/ip6_fib.c diff1 | diff2 | blob | history
net/ipv6/route.c diff1 | diff2 | blob | history
ubuntu-bionic-kernel mirror