David S. Miller 3d2dd617fb Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf ... Pablo Neira Ayuso says: ==================== Netfilter fixes for net This is a large batch of Netfilter fixes for net, they are: 1) Three patches to fix NAT conversion to rhashtable: Switch to rhlist structure that allows to have several objects with the same key. Moreover, fix wrong comparison logic in nf_nat_bysource_cmp() as this is expecting a return value similar to memcmp(). Change location of the nat_bysource field in the nf_conn structure to avoid zeroing this as it breaks interaction with SLAB_DESTROY_BY_RCU and lead us to crashes. From Florian Westphal. 2) Don't allow malformed fragments go through in IPv6, drop them, otherwise we hit GPF, patch from Florian Westphal. 3) Fix crash if attributes are missing in nft_range, from Liping Zhang. 4) Fix arptables 32-bits userspace 64-bits kernel compat, from Hongxu Jia. 5) Two patches from David Ahern to fix netfilter interaction with vrf. From David Ahern. 6) Fix element timeout calculation in nf_tables, we take milliseconds from userspace, but we use jiffies from kernelspace. Patch from Anders K. Pedersen. 7) Missing validation length netlink attribute for nft_hash, from Laura Garcia. 8) Fix nf_conntrack_helper documentation, we don't default to off anymore for a bit of time so let's get this in sync with the code. I know is late but I think these are important, specifically the NAT bits, as they are mostly addressing fallout from recent changes. I also read there are chances to have -rc8, if that is the case, that would also give us a bit more time to test this. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>		2016-12-01 11:04:41 -05:00
..
80211	docs-rst: sphinxify 802.11 documentation	2016-10-11 16:19:17 -06:00
ABI	platform-drivers-x86 for 4.9-3	2016-11-11 16:48:49 -08:00
DocBook	A single commit converting the mac80211 DocBook template over to Sphinx.	2016-10-14 14:11:22 -07:00
EDID	…
PCI	PCI changes for the v4.9 merge window:	2016-10-07 11:46:37 -07:00
RCU	kthread: kthread worker API cleanup	2016-10-11 15:06:33 -07:00
accounting	…
acpi	Merge branches 'acpi-button', 'acpi-battery' and 'acpi-doc'	2016-10-02 01:40:20 +02:00
aoe	…
arm	linux-kselftest-4.9-rc1-update	2016-10-14 15:17:12 -07:00
arm64	arm64 updates for 4.9:	2016-10-03 08:58:35 -07:00
auxdisplay	…
backlight	…
blackfin	samples: move blackfin gptimers-example from Documentation	2016-10-10 07:12:02 -06:00
block	…
blockdev	…
bus-devices	…
cdrom	…
cgroup-v1	…
cma	…
connector	…
console	…
cpu-freq	…
cpuidle	…
cris	…
crypto	…
dev-tools	mm: kmemleak: avoid using __va() on addresses that don't have a lowmem mapping	2016-10-11 15:06:33 -07:00
development-process	…
device-mapper	dm raid: fix activation of existing raid4/10 devices	2016-10-17 16:41:31 -04:00
devicetree	Documentation: devicetree: clarify usage of the RGMII phy-modes	2016-11-28 12:06:54 -05:00
dmaengine	…
driver-api	…
driver-model	power supply and reset changes for the v4.9 series	2016-10-06 18:21:15 -07:00
early-userspace	…
extcon	…
fault-injection	…
fb	…
features	Documentation: MIPS supports HAVE_REGS_AND_STACK_ACCESS_API	2016-10-13 17:19:19 +02:00
filesystems	fs: remove the never implemented aio_fsync file operation	2016-10-30 13:09:42 -04:00
firmware_class	…
fmc	…
fpga	…
frv	…
gpio	gpio/board.txt: point to gpiod_set_value	2016-10-20 14:14:11 +02:00
gpu	Merge tag 'drm-for-v4.9' of git://people.freedesktop.org/~airlied/linux	2016-10-11 18:12:22 -07:00
hid	…
hwmon	…
i2c	i2c: Documentation: i2c-topology: fix minor whitespace nit	2016-11-10 21:18:56 +01:00
ia64	…
ide	…
iio	iio: Documentation: Correct the path used to create triggers.	2016-10-01 00:49:58 -06:00
infiniband	IB/hfi1: Document new sysfs entries for hfi1 driver	2016-10-02 08:42:19 -04:00
input	Input: ALPS - add V8 protocol documentation	2016-10-04 11:47:02 -07:00
ioctl	…
isdn	…
ja_JP	…
kbuild	Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild	2016-10-14 14:26:58 -07:00
kdump	…
ko_KR	…
laptops	…
leds	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski/linux-leds	2016-10-04 10:25:53 -07:00
livepatch	…
locking	…
m68k	…
media	Linux 4.8	2016-10-05 16:43:53 -03:00
memory-devices	…
metag	…
mic	…
mips	…
misc-devices	…
mmc	…
mn10300	…
mtd	…
namespaces	…
netlabel	…
networking	netfilter: fix nf_conntrack_helper documentation	2016-11-24 12:50:24 +01:00
nfc	…
nios2	…
nvdimm	…
nvmem	…
parisc	…
pcmcia	…
perf	…
phy	…
platform	…
power	power supply and reset changes for the v4.9 series	2016-10-06 18:21:15 -07:00
powerpc	powerpc updates for 4.9	2016-10-07 20:19:31 -07:00
pps	…
prctl	…
pti	…
ptp	…
rapidio	…
s390	…
scheduler	…
scsi	scsi: g_NCR5380: Stop using scsi_module.c	2016-09-29 21:52:43 -04:00
security	…
serial	…
sh	…
sound	…
sphinx	…
sphinx-static	This is the documentation update pull for the 4.9 merge window.	2016-10-04 13:54:07 -07:00
spi	Doc: update 00-INDEX files to reflect the runnable code move	2016-10-10 07:12:09 -06:00
sysctl	mnt: Add a per mount namespace limit on the number of mounts	2016-09-30 12:46:48 -05:00
target	…
thermal	thermal: Add support for hardware-tracked trip points	2016-09-27 14:02:16 +08:00
timers	Doc: update 00-INDEX files to reflect the runnable code move	2016-10-10 07:12:09 -06:00
tpm	…
trace	This release cycle is rather small. Just a few fixes to tracing.	2016-10-06 11:48:41 -07:00
usb	…
virtual	kvm: kvmclock: let KVM_GET_CLOCK return whether the master clock is in use	2016-11-19 19:04:16 +01:00
vm	…
w1	…
watchdog	linux-kselftest-4.9-rc1-update	2016-10-14 15:17:12 -07:00
wimax	…
x86	Merge branch 'mm-pkeys-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2016-10-10 11:01:51 -07:00
xtensa	…
zh_CN	…
.gitignore	…
00-INDEX	Doc: update 00-INDEX files to reflect the runnable code move	2016-10-10 07:12:09 -06:00
BUG-HUNTING	…
Changes	…
CodeOfConflict	URL changed for Linux Foundation TAB	2016-10-01 00:57:13 -06:00
CodingStyle	…
DMA-API-HOWTO.txt	…
DMA-API.txt	…
DMA-ISA-LPC.txt	…
DMA-attributes.txt	dma-mapping: introduce the DMA_ATTR_NO_WARN attribute	2016-10-11 15:06:32 -07:00
HOWTO	…
IPMI.txt	…
IRQ-affinity.txt	…
IRQ-domain.txt	…
IRQ.txt	…
Intel-IOMMU.txt	…
Makefile	samples: move blackfin gptimers-example from Documentation	2016-10-10 07:12:02 -06:00
Makefile.sphinx	…
ManagementStyle	…
SAK.txt	…
SM501.txt	…
SecurityBugs	…
SubmitChecklist	…
SubmittingDrivers	…
SubmittingPatches	…
VGA-softcursor.txt	…
adding-syscalls.txt	…
applying-patches.txt	…
assoc_array.txt	…
atomic_ops.txt	…
bad_memory.txt	…
basic_profiling.txt	…
bcache.txt	…
binfmt_misc.txt	…
braille-console.txt	…
bt8xxgpio.txt	…
btmrvl.txt	…
bus-virt-phys-mapping.txt	…
cachetlb.txt	…
cgroup-v2.txt	…
circular-buffers.txt	…
clk.txt	…
conf.py	media updates for v4.9-rc1	2016-10-11 13:22:22 -07:00
cpu-hotplug.txt	…
cpu-load.txt	…
cputopology.txt	…
crc32.txt	…
dcdbas.txt	…
debugging-modules.txt	…
debugging-via-ohci1394.txt	…
dell_rbu.txt	…
devices.txt	…
digsig.txt	…
dma-buf-sharing.txt	…
docutils.conf	…
dontdiff	…
dynamic-debug-howto.txt	…
edac.txt	…
efi-stub.txt	…
eisa.txt	…
email-clients.txt	…
flexible-arrays.txt	…
futex-requeue-pi.txt	…
gcc-plugins.txt	…
highuid.txt	…
hw_random.txt	…
hwspinlock.txt	…
index.rst	docs-rst: sphinxify 802.11 documentation	2016-10-11 16:19:17 -06:00
init.txt	…
initrd.txt	…
intel_txt.txt	…
io-mapping.txt	…
io_ordering.txt	…
iostats.txt	…
irqflags-tracing.txt	…
isa.txt	…
isapnp.txt	…
java.txt	…
kernel-doc-nano-HOWTO.txt	…
kernel-docs.txt	…
kernel-documentation.rst	This is the documentation update pull for the 4.9 merge window.	2016-10-04 13:54:07 -07:00
kernel-parameters.txt	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2016-10-14 13:19:30 -07:00
kernel-per-CPU-kthreads.txt	…
kobject.txt	…
kprobes.txt	…
kref.txt	…
kselftest.txt	…
ldm.txt	…
local_ops.txt	…
lockup-watchdogs.txt	…
logo.gif	…
logo.txt	…
lzo.txt	…
magic-number.txt	…
mailbox.txt	…
md-cluster.txt	…
md.txt	…
memory-barriers.txt	…
memory-hotplug.txt	…
men-chameleon-bus.txt	…
module-signing.txt	…
mono.txt	…
nommu-mmap.txt	…
ntb.txt	…
numastat.txt	…
oops-tracing.txt	…
padata.txt	…
parport-lowlevel.txt	…
parport.txt	…
percpu-rw-semaphore.txt	…
phy.txt	…
pi-futex.txt	…
pinctrl.txt	…
pnp.txt	…
preempt-locking.txt	…
printk-formats.txt	…
pwm.txt	…
ramoops.txt	…
rbtree.txt	…
remoteproc.txt	remoteproc: Split driver and consumer dereferencing	2016-10-02 22:50:21 -07:00
rfkill.txt	…
robust-futex-ABI.txt	…
robust-futexes.txt	…
rpmsg.txt	…
rtc.txt	…
serial-console.txt	…
sgi-ioc4.txt	…
smsc_ece1099.txt	…
stable_api_nonsense.txt	…
stable_kernel_rules.txt	…
static-keys.txt	…
svga.txt	…
sync_file.txt	…
sysfs-rules.txt	…
sysrq.txt	…
this_cpu_ops.txt	…
unaligned-memory-access.txt	…
unicode.txt	…
unshare.txt	…
vfio.txt	…
video-output.txt	…
vme_api.txt	…
volatile-considered-harmful.txt	…
workqueue.txt	…
xillybus.txt	…
xz.txt	…
zorro.txt	…