git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

author	Pablo Neira Ayuso <pablo@netfilter.org>
	Wed, 8 Apr 2015 15:40:17 +0000 (17:40 +0200)
committer	Pablo Neira Ayuso <pablo@netfilter.org>
	Wed, 8 Apr 2015 16:30:21 +0000 (18:30 +0200)
commit	af6b6d65158799f1304c74ea22e87ed3a80a49d9
tree	28ca52d17183cb1d732b1324fce4f7b5d6b3dfc0	tree \| snapshot
parent	b4b1ddde9d15bfee26d2345863f8e301327fd6f8	commit \| diff
parent	7462065ae49b7cd2d03dae14c449533b35a3827a	commit \| diff

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

Resolve conflicts between f6fad64 ("Merge branch 'nf-hook-compress'") and
Florian Westphal br_netfilter works.

Conflicts:
net/bridge/br_netfilter.c

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

Linux Kernel Source Tree.

RSS Atom

include/linux/netfilter_bridge.h	diff1 \|	diff2 \|	blob \| history
include/net/netfilter/nf_tables.h	diff1 \|	diff2 \|	blob \| history
net/bridge/br_netfilter.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_queue.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nfnetlink_queue_core.c	diff1 \|	diff2 \|	blob \| history