git.openwrt.org Git - openwrt/staging/ldir.git/commit

projects / openwrt / staging / ldir.git / commit

author	Matthias Schiffer <[email protected]>
	Fri, 30 Sep 2016 21:28:21 +0000 (23:28 +0200)
committer	Matthias Schiffer <[email protected]>
	Fri, 30 Sep 2016 21:32:05 +0000 (23:32 +0200)
commit	cea09329e50f5766b6b44149aa17e4a681546bbb
tree	d0357252ebccba5b9cfdb93bce00e4469d8b63d0	tree \| snapshot
parent	c50ba61cafa616becf43e6a0148abea42935e03b	commit \| diff

netfilter: fix file conflicts between kmod-ipt- and kmod-nft- packages

The nf_reject_* and nf_nat_masquerade_* modules are moved into the
corresponding kmod-nf- packages. Appropriate dependencies are added to the
kmod-nft- packages.

Signed-off-by: Matthias Schiffer <[email protected]>

Kevin D-Bs staging tree

RSS Atom

include/netfilter.mk		diff \| blob \| history
package/kernel/linux/modules/netfilter.mk		diff \| blob \| history
target/linux/generic/config-3.18		diff \| blob \| history
target/linux/generic/config-4.1		diff \| blob \| history
target/linux/generic/config-4.4		diff \| blob \| history