David S. Miller e3a88f9c4f Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf ... Pablo Neira Ayuso says: ==================== netfilter/ipvs fixes for net The following patchset contains fixes for netfilter/ipvs. This round of fixes is larger than usual at this stage, specifically because of the nf_tables bridge reject fixes that I would like to see in 3.18. The patches are: 1) Fix a null-pointer dereference that may occur when logging errors. This problem was introduced by 4a4739d56b ("ipvs: Pull out crosses_local_route_boundary logic") in v3.17-rc5. 2) Update hook mask in nft_reject_bridge so we can also filter out packets from there. This fixes 36d2af5 ("netfilter: nf_tables: allow to filter from prerouting and postrouting"), which needs this chunk to work. 3) Two patches to refactor common code to forge the IPv4 and IPv6 reject packets from the bridge. These are required by the nf_tables reject bridge fix. 4) Fix nft_reject_bridge by avoiding the use of the IP stack to reject packets from the bridge. The idea is to forge the reject packets and inject them to the original port via br_deliver() which is now exported for that purpose. 5) Restrict nft_reject_bridge to bridge prerouting and input hooks. the original skbuff may cloned after prerouting when the bridge stack needs to flood it to several bridge ports, it is too late to reject the traffic. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>		2014-10-31 12:29:42 -04:00
..
acpi
asm-generic	Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus	2014-10-18 14:24:36 -07:00
clocksource
crypto	crypto: LLVMLinux: Add macro to remove use of VLAIS in crypto code	2014-10-14 10:51:22 +02:00
drm	drm/mst: rework payload table allocation to conform better.	2014-10-13 14:40:53 +10:00
dt-bindings	The clk tree changes for 3.18 are dominated by clock drivers. Mostly	2014-10-15 07:05:03 +02:00
keys	KEYS: Restore partial ID matching functionality for asymmetric keys	2014-10-06 15:21:05 +01:00
kvm	arm/arm64: KVM: Fix BE accesses to GICv2 EISR and ELRSR regs	2014-10-16 10:57:41 +02:00
linux	net: skb_fclone_busy() needs to detect orphaned skb	2014-10-30 19:58:30 -04:00
math-emu
media	Merge branch 'patchwork' into v4l_for_linus	2014-10-09 14:00:54 -03:00
memory
misc	cxl: Add new header for call backs and structs	2014-10-08 20:15:43 +11:00
net	Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf	2014-10-31 12:29:42 -04:00
pcmcia
ras
rdma	IB/mlx5, iser, isert: Add Signature API additions	2014-10-09 00:10:53 -07:00
rxrpc
scsi	Merge branch 'for-3.18/core' of git://git.kernel.dk/linux-block	2014-10-18 11:53:51 -07:00
soc/tegra
sound	Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma	2014-10-18 18:11:04 -07:00
target
trace	Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2014-10-13 15:44:12 +02:00
uapi	. fix DM's long-standing excessive use of memory by leveraging the new	2014-10-18 12:25:30 -07:00
video	fbdev changes for 3.18	2014-10-18 18:03:02 -07:00
xen	xen: remove DEFINE_XENBUS_DRIVER() macro	2014-10-06 10:27:57 +01:00
Kbuild