Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1e9f0207 authored Sep 03, 2012 by David S. Miller

Merge branch 'master' of git://1984.lsi.us.es/nf-next

parents 684bad11 ace1fe12

Documentation/feature-removal-schedule.txt

+0 −8

Original line number	Diff line number	Diff line
		@@ -353,14 +353,6 @@ Why: Internal alias support has been present in module-init-tools for some

		Who: Wey-Yi Guy <wey-yi.w.guy@intel.com>

		---------------------------

		What: xt_NOTRACK
		Files: net/netfilter/xt_NOTRACK.c
		When: April 2011
		Why: Superseded by xt_CT
		Who: Netfilter developer team <netfilter-devel@vger.kernel.org>

		----------------------------

		What: IRQF_DISABLED

arch/m68k/configs/amiga_defconfig

+0 −1

Original line number	Diff line number	Diff line
		@@ -67,7 +67,6 @@ CONFIG_NETFILTER_XT_TARGET_DSCP=m
		CONFIG_NETFILTER_XT_TARGET_MARK=m
		CONFIG_NETFILTER_XT_TARGET_NFLOG=m
		CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
		CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
		CONFIG_NETFILTER_XT_TARGET_TRACE=m
		CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
		CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m

arch/m68k/configs/apollo_defconfig

+0 −1

Original line number	Diff line number	Diff line
		@@ -67,7 +67,6 @@ CONFIG_NETFILTER_XT_TARGET_DSCP=m
		CONFIG_NETFILTER_XT_TARGET_MARK=m
		CONFIG_NETFILTER_XT_TARGET_NFLOG=m
		CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
		CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
		CONFIG_NETFILTER_XT_TARGET_TRACE=m
		CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
		CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m

arch/m68k/configs/atari_defconfig

+0 −1

Original line number	Diff line number	Diff line
		@@ -65,7 +65,6 @@ CONFIG_NETFILTER_XT_TARGET_DSCP=m
		CONFIG_NETFILTER_XT_TARGET_MARK=m
		CONFIG_NETFILTER_XT_TARGET_NFLOG=m
		CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
		CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
		CONFIG_NETFILTER_XT_TARGET_TRACE=m
		CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
		CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m

arch/m68k/configs/bvme6000_defconfig

+0 −1

Original line number	Diff line number	Diff line
		@@ -65,7 +65,6 @@ CONFIG_NETFILTER_XT_TARGET_DSCP=m
		CONFIG_NETFILTER_XT_TARGET_MARK=m
		CONFIG_NETFILTER_XT_TARGET_NFLOG=m
		CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
		CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
		CONFIG_NETFILTER_XT_TARGET_TRACE=m
		CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
		CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m