David S. Miller
5fccd64aa4
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next ...
Pablo Neira Ayuso says:
====================
Netfilter/IPVS updates for net-next
The following patchset contains a large Netfilter update for net-next,
to summarise:
1) Add support for stateful objects. This series provides a nf_tables
native alternative to the extended accounting infrastructure for
nf_tables. Two initial stateful objects are supported: counters and
quotas. Objects are identified by a user-defined name, you can fetch
and reset them anytime. You can also use a maps to allow fast lookups
using any arbitrary key combination. More info at:
http://marc.info/?l=netfilter-devel&m=148029128323837&w=2
2) On-demand registration of nf_conntrack and defrag hooks per netns.
Register nf_conntrack hooks if we have a stateful ruleset, ie.
state-based filtering or NAT. The new nf_conntrack_default_on sysctl
enables this from newly created netnamespaces. Default behaviour is not
modified. Patches from Florian Westphal.
3) Allocate 4k chunks and then use these for x_tables counter allocation
requests, this improves ruleset load time and also datapath ruleset
evaluation, patches from Florian Westphal.
4) Add support for ebpf to the existing x_tables bpf extension.
From Willem de Bruijn.
5) Update layer 4 checksum if any of the pseudoheader fields is updated.
This provides a limited form of 1:1 stateless NAT that make sense in
specific scenario, eg. load balancing.
6) Add support to flush sets in nf_tables. This series comes with a new
set->ops->deactivate_one() indirection given that we have to walk
over the list of set elements, then deactivate them one by one.
The existing set->ops->deactivate() performs an element lookup that
we don't need.
7) Two patches to avoid cloning packets, thus speed up packet forwarding
via nft_fwd from ingress. From Florian Westphal.
8) Two IPVS patches via Simon Horman: Decrement ttl in all modes to
prevent infinite loops, patch from Dwip Banerjee. And one minor
refactoring from Gao feng.
9) Revisit recent log support for nf_tables netdev families: One patch
to ensure that we correctly handle non-ethernet packets. Another
patch to add missing logger definition for netdev. Patches from
Liping Zhang.
10) Three patches for nft_fib, one to address insufficient register
initialization and another to solve incorrect (although harmless)
byteswap operation. Moreover update xt_rpfilter and nft_fib to match
lbcast packets with zeronet as source, eg. DHCP Discover packets
(0.0.0.0 -> 255.255.255.255). Also from Liping Zhang.
11) Built-in DCCP, SCTP and UDPlite conntrack and NAT support, from
Davide Caratti. While DCCP is rather hopeless lately, and UDPlite has
been broken in many-cast mode for some little time, let's give them a
chance by placing them at the same level as other existing protocols.
Thus, users don't explicitly have to modprobe support for this and
NAT rules work for them. Some people point to the lack of support in
SOHO Linux-based routers that make deployment of new protocols harder.
I guess other middleboxes outthere on the Internet are also to blame.
Anyway, let's see if this has any impact in the midrun.
12) Skip software SCTP software checksum calculation if the NIC comes
with SCTP checksum offload support. From Davide Caratti.
13) Initial core factoring to prepare conversion to hook array. Three
patches from Aaron Conole.
14) Gao Feng made a wrong conversion to switch in the xt_multiport
extension in a patch coming in the previous batch. Fix it in this
batch.
15) Get vmalloc call in sync with kmalloc flags to avoid a warning
and likely OOM killer intervention from x_tables. From Marcelo
Ricardo Leitner.
16) Update Arturo Borrero's email address in all source code headers.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
2016-12-07 19:16:46 -05:00
fbdev changes for 4.9
2016-10-12 11:01:37 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2016-10-05 10:11:24 -07:00
libceph: initialize last_linger_id with a large integer
2016-11-10 20:13:08 +01:00
firmware /meson
treewide: remove redundant #include <linux/kconfig.h>
2016-10-11 15:06:33 -07:00
irqchip/gic-v3-its: Fix entry size mask for GITS_BASER
2016-10-17 16:26:29 +01:00
- Core Frameworks
2016-10-07 08:35:35 -07:00
Revert "net/mlx4_en: Avoid unregister_netdev at shutdown flow"
2016-11-28 15:33:46 -05:00
net/mlx5e: Implement Fragmented Work Queue (WQ)
2016-12-02 10:47:01 -05:00
MMC core:
2016-10-05 11:34:53 -07:00
mtd: nand: Fix data interface configuration logic
2016-10-28 09:58:36 +02:00
netfilter: x_tables: pack percpu counter allocations
2016-12-06 21:42:19 +01:00
Merge branch 'smp-hotplug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2016-10-03 19:43:08 -07:00
phy: Add reset callback for not generic phy
2016-11-05 13:45:02 +05:30
media updates for v4.9-rc1
2016-10-11 13:22:22 -07:00
qed: Add support for hardware offloaded iSCSI.
2016-12-02 12:44:37 -05:00
Merge tag 'md/4.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shli/md
2016-10-07 09:45:43 -07:00
Merge remote-tracking branches 'regulator/topic/of', 'regulator/topic/pv88080', 'regulator/topic/rk808', 'regulator/topic/set-voltage' and 'regulator/topic/tps65218' into regulator-next
2016-09-30 09:13:58 -07:00
Merge remote-tracking branches 'spi/topic/fsl-espi', 'spi/topic/imx', 'spi/topic/jcore', 'spi/topic/loopback' and 'spi/topic/meson' into spi-next
2016-09-30 09:14:10 -07:00
sunrpc: svc_age_temp_xprts_now should not call setsockopt non-tcp transports
2016-11-14 10:30:58 -05:00
Merge branch 'device-properties'
2016-11-11 23:23:02 +01:00
autofs4: move linux/auto_dev-ioctl.h to uapi/linux
2016-10-11 15:06:31 -07:00
autofs: move inclusion of linux/limits.h to uapi
2016-10-11 15:06:31 -07:00
mm/vmalloc.c: fix align value calculation error
2016-10-07 18:46:26 -07:00
Merge branch 'for-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
2016-10-14 12:18:50 -07:00
Merge branch 'for-4.9/block-smp' of git://git.kernel.dk/linux-block
2016-10-09 17:32:20 -07:00
mm/nobootmem.c: remove duplicate macro ARCH_LOW_ADDRESS_LIMIT statements
2016-10-07 18:46:28 -07:00
bpf: Add new cgroup attach type to enable sock modifications
2016-12-02 13:46:08 -05:00
bpf: add prog_digest and expose it via fdinfo/netlink
2016-12-05 15:33:11 -05:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2016-11-22 13:27:16 -05:00
net: phy: broadcom: Add support code for reading PHY counters
2016-11-30 10:22:27 -05:00
cgroup: add support for eBPF programs
2016-11-25 16:25:52 -05:00
Merge branch 'for-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
2016-10-14 12:18:50 -07:00
clk: core: add __init decoration for CLK_OF_DECLARE_DRIVER function
2016-10-17 15:27:27 -07:00
mm, compaction: restrict full priority to non-costly orders
2016-10-07 18:46:29 -07:00
compat: remove compat_printk()
2016-09-27 21:20:53 -04:00
kasan: update kasan_global for gcc 7
2016-11-30 16:32:52 -08:00
This adds a new gcc plugin named "latent_entropy". It is designed to
2016-10-15 10:03:15 -07:00
Revert "console: don't prefer first registered if DT specifies stdout-path"
2016-11-11 08:12:37 -08:00
nmi_backtrace: generate one-line reports for idle cpus
2016-10-07 18:46:30 -07:00
cpufreq: fix overflow in cpufreq_table_find_index_dl()
2016-10-20 16:35:50 +02:00
clocksource: Add J-Core timer/clocksource driver
2016-10-20 20:10:17 +02:00
cred: simpler, 1D supplementary groups
2016-10-07 18:46:30 -07:00
include/linux/ctype.h: make isdigit() table lookupless
2016-10-11 15:06:30 -07:00
debugfs: constify argument to debugfs_real_fops()
2016-11-04 14:56:16 -04:00
devres: add devm_alloc_percpu()
2016-11-15 22:34:25 -05:00
dma-mapping: introduce the DMA_ATTR_NO_WARN attribute
2016-10-11 15:06:32 -07:00
genetlink: statically initialize families
2016-10-27 16:16:09 -04:00
Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
2016-10-14 14:26:58 -07:00
exportfs: be careful to only return expected errors.
2016-10-06 09:07:44 -04:00
f2fs: use crc and cp version to determine roll-forward recovery
2016-09-30 10:05:46 -07:00
vfs: add a FALLOC_FL_UNSHARE mode to fallocate to unshare a range of blocks
2016-10-03 09:11:14 -07:00
net: use core MTU range checking in misc drivers
2016-10-20 14:51:10 -04:00
This adds a new gcc plugin named "latent_entropy". It is designed to
2016-10-15 10:03:15 -07:00
bpf: add prog_digest and expose it via fdinfo/netlink
2016-12-05 15:33:11 -05:00
mm, frontswap: make sure allocated frontswap map is assigned
2016-11-11 08:12:37 -08:00
aio: fix freeze protection of aio writes
2016-10-30 13:09:42 -04:00
Lots of bug fixes and cleanups.
2016-10-07 15:15:33 -07:00
fanotify: use notification_lock instead of access_lock
2016-10-07 18:46:26 -07:00
This release cycle is rather small. Just a few fixes to tracing.
2016-10-06 11:48:41 -07:00
latent_entropy: Mark functions with __latent_entropy
2016-10-10 14:51:45 -07:00
genetlink: mark families as __ro_after_init
2016-10-27 16:16:09 -04:00
net: use core MTU range checking in WAN drivers
2016-10-20 14:51:09 -04:00
HID: add missing \n to end of dev_warn messages
2016-09-29 10:40:13 +02:00
net: use core MTU range checking in misc drivers
2016-10-20 14:51:10 -04:00
mremap: fix race between mremap() and page cleanning
2016-11-17 09:46:56 -08:00
mm: remove unnecessary condition in remove_inode_hugepages
2016-10-07 18:46:29 -07:00
Revert "hv_netvsc: report vmbus name in ethtool"
2016-10-29 15:03:14 -04:00
cfg80211: Add KEK/nonces for FILS association frames
2016-10-27 16:03:24 +02:00
bpf: reuse dev_is_mac_header_xmit for redirect
2016-11-27 20:38:47 -05:00
Fixing a bug in team driver due to incorrect 'unsigned int' to 'int' conversion
2016-10-07 23:50:39 -04:00
vxlan: avoid vlan processing in vxlan device.
2016-11-15 12:16:13 -05:00
This adds a new gcc plugin named "latent_entropy". It is designed to
2016-10-15 10:03:15 -07:00
iommu/vt-d: Fix PASID table allocation
2016-11-19 09:42:35 -08:00
x86/io: add interface to reserve io memtype for a resource range. (v1.1)
2016-10-26 15:45:38 +10:00
iomap: add IOMAP_REPORT
2016-10-20 15:51:28 +11:00
ipv6 addrconf: Implemented enhanced DAD (RFC7527)
2016-12-03 23:21:37 -05:00
jiffies: add time comparison functions for 64 bit jiffies
2016-10-07 18:46:26 -07:00
Merge branch 'ras-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2016-10-03 13:22:39 -07:00
kprobes: Unpoison stack in jprobe_return() for KASAN
2016-10-16 11:02:31 +02:00
kconfig.h: remove config_enabled() macro
2016-10-27 18:43:43 -07:00
printk: reinstate KERN_CONT for printing continuation lines
2016-10-09 12:23:38 -07:00
min/max: remove sparse warnings when they're nested
2016-10-07 18:46:30 -07:00
kdump, vmcoreinfo: report memory sections virtual addresses
2016-10-11 15:06:33 -07:00
mm: kmemleak: avoid using __va() on addresses that don't have a lowmem mapping
2016-10-11 15:06:33 -07:00
kthread: add kerneldoc for kthread_create()
2016-10-11 15:06:33 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2016-10-05 10:11:24 -07:00
libnvdimm, region: move region-mapping input-paramters to nd_mapping_desc
2016-09-30 19:13:42 -07:00
bus: mvebu-bus: Provide inline stub for mvebu_mbus_get_dram_win_info
2016-11-18 13:54:21 -05:00
mm/memblock.c: expose total reserved memory
2016-10-07 18:46:28 -07:00
mm: memcontrol: consolidate cgroup socket tracking
2016-10-07 18:46:29 -07:00
net: mii: add generic function to support ksetting support
2016-11-02 15:17:09 -04:00
mm: unexport __get_user_pages()
2016-10-24 19:13:20 -07:00
kernel, oom: fix potential pgd_lock deadlock from __mmdrop
2016-10-07 18:46:27 -07:00
mm: remove per-zone hashtable of bitlock waitqueues
2016-10-27 09:27:57 -07:00
mnt: Add a per mount namespace limit on the number of mounts
2016-09-30 12:46:48 -05:00
libnvdimm, namespace: sort namespaces by dpa at init
2016-10-07 09:20:53 -07:00
net/sched: cls_flower: Add offload support using egress Hardware device
2016-12-02 13:28:37 -05:00
netfilter: decouple nf_hook_entry and nf_hook_ops
2016-12-06 21:42:16 +01:00
netfilter: ingress: translate 0 nf_hook_slow retval to -1
2016-12-06 21:48:21 +01:00
netpoll: more efficient locking
2016-11-16 18:32:02 -05:00
nmi_backtrace: add more trigger_*_cpu_backtrace() methods
2016-10-07 18:46:30 -07:00
nvme.h: add an enum for cns values
2016-10-19 11:36:22 -06:00
of/serial: move earlycon early_param handling to serial
2016-09-28 17:43:15 +02:00
gpio: OF: localize some gpiochip init functions
2016-10-03 23:38:11 +02:00
of_mdio: add helper to deregister fixed-link PHYs
2016-11-29 23:17:02 -05:00
dmaengine/ARM: omap-dma: Fix the DMAengine compile test on non OMAP configs
2016-09-28 08:53:14 +05:30
mm, oom: enforce exit_oom_victim on current task
2016-10-07 18:46:28 -07:00
mm/page_owner: don't define fields on struct page_ext by hard-coding
2016-10-07 18:46:27 -07:00
mm/page_owner: move page_owner specific function to page_owner.c
2016-10-07 18:46:27 -07:00
mm: fix false-positive WARN_ON() in truncate/invalidate for hugetlb
2016-11-30 16:32:52 -08:00
PCI: Export pcie_find_root_port
2016-11-23 16:23:23 -06:00
perf/powerpc: Don't call perf_event_disable() from atomic context
2016-10-28 11:06:25 +02:00
net: phy: add mdix_ctrl to hold the user configuration.
2016-12-01 11:26:47 -05:00
net: phy: leds: add support for led triggers on phy link state change
2016-10-18 11:56:31 -04:00
net: pim: add all RFC7761 message types
2016-10-31 16:18:30 -04:00
pipe: fix comment in pipe_buf_operations
2016-10-05 18:24:00 -04:00
pkeys: Remove easily triggered WARN
2016-10-14 11:36:59 -07:00
Merge remote-tracking branch 'jk/vfs' into work.misc
2016-10-08 11:06:08 -04:00
posix_acl: uapi header split
2016-09-27 21:52:00 -04:00
printk: reinstate KERN_CONT for printing continuation lines
2016-10-09 12:23:38 -07:00
net: add an ioctl to get a socket network namespace
2016-10-31 10:56:36 -04:00
include/linux/property.h: fix typo/compile error
2016-09-30 15:26:52 -07:00
ptp: Introduce a high resolution frequency adjustment method.
2016-11-09 21:19:53 -05:00
radix-tree: 'slot' can be NULL in radix_tree_next_slot()
2016-10-11 15:06:30 -07:00
This adds a new gcc plugin named "latent_entropy". It is designed to
2016-10-15 10:03:15 -07:00
Merge remote-tracking branches 'regmap/fix/header' and 'regmap/fix/macro' into regmap-linus
2016-10-29 12:14:39 -06:00
relay: Use irq_work instead of plain timer for deferred wakeup
2016-10-11 15:06:32 -07:00
remoteproc: Split driver and consumer dereferencing
2016-10-02 22:50:21 -07:00
sched/autogroup: Do not use autogroup->tg in zombie threads
2016-11-22 12:33:43 +01:00
ipv6: implement dataplane support for rthdr type 4 (Segment Routing Header)
2016-11-09 20:40:06 -05:00
ipv6: sr: add code base for control plane support of SR-IPv6
2016-11-09 20:40:06 -05:00
ipv6: sr: add core files for SR HMAC support
2016-11-09 20:40:06 -05:00
ipv6: sr: add support for SRH encapsulation and injection with lwtunnels
2016-11-09 20:40:06 -05:00
ipc/sem.c: fix complex_count vs. simple op race
2016-10-11 15:06:33 -07:00
seq/proc: modify seq_put_decimal_[u]ll to take a const char *, not char
2016-10-07 18:46:30 -07:00
ACPI: parse SPCR and enable matching console
2016-09-28 17:46:46 +02:00
net: fix bogus cast in skb_pagelen() and use unsigned variables
2016-11-19 22:11:25 -05:00
ARM: pxa: enhance smc91x platform data
2016-10-18 14:14:20 -04:00
new iov_iter flavour: pipe-backed
2016-10-05 18:23:36 -04:00
Revert "net: stmmac: allow to split suspend/resume from init/exit callbacks"
2016-11-09 13:21:25 -05:00
mm, swap: add swap_cluster_list
2016-10-07 18:46:27 -07:00
generic syscalls: kill cruft from removed pkey syscalls
2016-10-17 09:50:56 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace
2016-10-06 09:52:23 -07:00
tcp: tsq: move tsq_flags close to sk_wmem_alloc
2016-12-05 13:32:24 -05:00
sched/core, x86: Make struct thread_info arch specific again
2016-10-20 13:27:47 +02:00
u64_stats: Introduce IRQs disabled helpers
2016-09-30 11:46:40 +02:00
Merge branch 'work.splice_read' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2016-10-10 13:38:49 -07:00
virtio_net: Do not clear memory for struct virtio_net_hdr twice.
2016-11-19 10:37:03 -05:00
sched/wait: Introduce init_wait_entry()
2016-09-30 10:54:03 +02:00
watchdog: add watchdog pretimeout governor framework
2016-10-08 10:27:10 +02:00
mm, vmscan: get rid of throttle_vm_writeout
2016-10-07 18:46:27 -07:00
vfs: Remove {get,set,remove}xattr inode operations
2016-10-07 21:48:36 -04:00
