David S. Miller
ca69d7102f
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next ...
Pablo Neira Ayuso says:
====================
Netfilter updates for net-next
The following patchset contains Netfilter updates for your net-next tree.
They are:
* nf_tables set timeout infrastructure from Patrick Mchardy.
1) Add support for set timeout support.
2) Add support for set element timeouts using the new set extension
infrastructure.
4) Add garbage collection helper functions to get rid of stale elements.
Elements are accumulated in a batch that are asynchronously released
via RCU when the batch is full.
5) Add garbage collection synchronization helpers. This introduces a new
element busy bit to address concurrent access from the netlink API and the
garbage collector.
5) Add timeout support for the nft_hash set implementation. The garbage
collector peridically checks for stale elements from the workqueue.
* iptables/nftables cgroup fixes:
6) Ignore non full-socket objects from the input path, otherwise cgroup
match may crash, from Daniel Borkmann.
7) Fix cgroup in nf_tables.
8) Save some cycles from xt_socket by skipping packet header parsing when
skb->sk is already set because of early demux. Also from Daniel.
* br_netfilter updates from Florian Westphal.
9) Save frag_max_size and restore it from the forward path too.
10) Use a per-cpu area to restore the original source MAC address when traffic
is DNAT'ed.
11) Add helper functions to access physical devices.
12) Use these new physdev helper function from xt_physdev.
13) Add another nf_bridge_info_get() helper function to fetch the br_netfilter
state information.
14) Annotate original layer 2 protocol number in nf_bridge info, instead of
using kludgy flags.
15) Also annotate the pkttype mangling when the packet travels back and forth
from the IP to the bridge layer, instead of using a flag.
* More nf_tables set enhancement from Patrick:
16) Fix possible usage of set variant that doesn't support timeouts.
17) Avoid spurious "set is full" errors from Netlink API when there are pending
stale elements scheduled to be released.
18) Restrict loop checks to set maps.
19) Add support for dynamic set updates from the packet path.
20) Add support to store optional user data (eg. comments) per set element.
BTW, I have also pulled net-next into nf-next to anticipate the conflict
resolution between your okfn() signature changes and Florian's br_netfilter
updates.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-04-09 14:46:04 -04:00
ARM: 8256/1: driver coamba: add device binding path 'driver_override'
2015-02-10 10:23:15 +00:00
bcma: allow disabling (not building) PCI driver
2015-03-13 16:25:50 +02:00
can: add combined rx/tx LED trigger support
2015-03-22 23:50:11 +01:00
libceph: tcp_nodelay support
2015-02-19 13:31:40 +03:00
clk: omap: compile legacy omap3 clocks conditionally
2015-02-03 11:06:11 -08:00
fsl /bestcomm
iio: core: Introduce IIO_CHAN_INFO_DEBOUNCE_COUNT and _TIME
2015-01-29 18:49:57 +00:00
Input: MT - add support for balanced slot assignment
2015-02-01 11:50:35 -08:00
irqchip: gicv3-its: Use non-cacheable accesses when no shareability
2015-03-29 19:25:57 +00:00
regulator: palmas: Correct TPS659038 register definition for REGEN2
2015-03-17 12:19:14 +00:00
net/mlx4_en: Add RX-ALL support
2015-04-02 16:25:04 -04:00
net/mlx5_core: Extend struct mlx5_interface to support multiple protocols
2015-04-02 16:33:43 -04:00
brcmfmac: add support for BCM43430 SDIO chipset
2015-03-20 09:03:46 +02:00
MTD updates for 3.20-rc1
2015-02-18 08:01:44 -08:00
netlink: implement nla_put_in_addr and nla_put_in6_addr
2015-03-31 13:58:35 -04:00
netfilter: Pass nf_hook_state through arpt_do_table().
2015-04-04 13:26:52 -04:00
netfilter: Pass nf_hook_state through ipt_do_table().
2015-04-04 12:47:04 -04:00
netfilter: Pass nf_hook_state through ip6t_do_table().
2015-04-04 12:52:06 -04:00
SCSI misc on 20150209
2015-02-11 10:28:45 -08:00
Revert "pinctrl: consumer: use correct retval for placeholder functions"
2015-03-05 10:08:14 +01:00
NFC: nxp-nci: Add support for NXP NCI chips
2015-03-26 11:07:50 +01:00
regulator: Fix documentation for regmap in the config
2015-03-18 11:42:30 +00:00
rtc: add driver for DS1685 family of real time clocks
2015-02-16 17:56:05 -08:00
soc /ti
cc2520: Add support for CC2591 amplifier.
2015-03-18 17:50:25 +01:00
bcma: detect SPROM revision 11
2015-01-29 10:49:28 +02:00
sunrpc: make debugfs file creation failure non-fatal
2015-03-31 14:15:08 -04:00
usbnet: Fix tx_bytes statistic running backward in cdc_ncm
2015-03-29 12:06:45 -07:00
ACPI: Add interfaces to parse IOAPIC ID for IOAPIC hotplug
2015-02-05 15:09:26 +01:00
ata: ahci_platform: fix owner module reference mismatch for scsi host
2015-01-28 18:45:23 -05:00
ata: pata_platform: fix owner module reference mismatch for scsi host
2015-01-28 18:45:23 -05:00
Merge branch 'getname2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2015-02-17 15:27:47 -08:00
Merge branch 'lazytime' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2015-02-17 16:12:34 -08:00
watchdog: bcm47xx_wdt.c: add restart handler support
2015-02-17 21:33:27 +01:00
block: merge __bio_map_user_iov into bio_map_user_iov
2015-02-05 09:30:43 -07:00
bitmap, cpumask, nodemask: remove dedicated formatting functions
2015-02-13 21:21:39 -08:00
Merge branch 'for-3.20/core' of git://git.kernel.dk/linux-block
2015-02-12 14:13:23 -08:00
block: remove unused function blk_bio_map_sg
2015-02-11 11:24:14 -07:00
tc: bpf: generalize pedit action
2015-03-29 13:26:54 -07:00
net: phy: bcm7xxx: add alternate id for 7439
2015-03-09 23:57:54 -04:00
clk: Add __clk_hw_set_clk helper function
2015-02-18 09:40:07 -08:00
clk: introduce clk_is_match
2015-03-11 15:56:59 -07:00
mm/compaction: add tracepoint to observe behaviour of compaction defer
2015-02-11 17:06:04 -08:00
compat: Declare compat_sys_sigpending and compat_sys_sigprocmask prototypes
2015-01-27 09:37:53 +00:00
compiler: introduce __alias(symbol) shortcut
2015-02-13 21:21:40 -08:00
kasan: enable instrumentation of global variables
2015-02-13 21:21:42 -08:00
kasan: enable instrumentation of global variables
2015-02-13 21:21:42 -08:00
kernel: make READ_ONCE() valid on const arguments
2015-02-21 10:27:33 -08:00
coresight: remove the unnecessary function coresight_is_bit_set()
2015-02-04 10:42:55 -08:00
cpuidle / sleep: Use broadcast timer for states that stop local timer
2015-03-05 23:13:19 +01:00
bitmap, cpumask, nodemask: remove dedicated formatting functions
2015-02-13 21:21:39 -08:00
lib/halfmd4.c: simplify includes
2015-02-12 18:54:15 -08:00
VFS: Split DCACHE_FILE_TYPE into regular and special types
2015-02-22 11:38:38 -05:00
ipv4: dccp: handle ICMP messages on DCCP_NEW_SYN_RECV request sockets
2015-03-23 16:52:26 -04:00
debugfs: Provide a file creation function that also takes an initial size
2015-02-17 12:21:51 -05:00
PM / devfreq: event: Add devfreq_event class
2015-01-30 17:56:40 +09:00
dm snapshot: suspend merging snapshot when doing exception handover
2015-02-27 14:53:16 -05:00
device: Change dev_<level> logging functions to return void
2015-01-26 15:57:59 -08:00
Merge branch 'topic/rcar' into for-linus
2015-02-02 16:55:43 -08:00
arm64 updates for 3.20:
2015-02-11 18:03:54 -08:00
net: Kill dev_rebuild_header
2015-03-02 16:43:41 -05:00
exportfs: add methods for block layout exports
2015-02-05 14:35:17 +01:00
f2fs: introduce macros to convert bytes and blocks in f2fs
2015-02-11 17:04:48 -08:00
filter: introduce SKF_AD_VLAN_TPID BPF extension
2015-03-24 15:25:15 -04:00
fs: make sure the timestamps for lazytime inodes eventually get written
2015-03-17 12:23:19 -04:00
fsnotify: fix handling of renames in audit
2015-02-10 14:30:28 -08:00
The updates included in this pull request for ftrace are:
2015-02-12 08:37:41 -08:00
mm/mempolicy.c: merge alloc_hugepage_vma to alloc_pages_vma
2015-02-11 17:06:04 -08:00
[media] hdmi: rename HDMI_AUDIO_CODING_TYPE_EXT_STREAM to _EXT_CT
2015-01-27 10:19:12 -02:00
HID: hid-sensor-hub: Correct documentation
2015-02-17 13:34:44 +01:00
gpu: host1x: Provide a proper struct bus_type
2015-01-27 10:09:14 +01:00
mm: numa: do not trap faults on the huge zero page
2015-02-12 18:54:08 -08:00
mm/hugetlb: take page table lock in follow_huge_pmd()
2015-02-11 17:06:01 -08:00
Merge branch 'i2c/for-3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
2015-02-21 12:41:50 -08:00
mac80111: Add BIP-CMAC-256 cipher
2015-01-27 11:09:13 +01:00
mac802154: correct max sifs size handling
2015-03-14 17:11:30 +01:00
bridge: Extend Proxy ARP design to allow optional rules for Wi-Fi
2015-03-05 14:52:23 -05:00
pppoe: Use workqueue to die properly when a PADT is received
2015-03-02 00:17:31 -05:00
net: Move check for multiple vlans to drivers
2015-03-29 13:33:22 -07:00
ipv4, ipv6: kill ip_mc_{join, leave}_group and ipv6_sock_mc_{join, drop}
2015-03-18 22:05:09 -04:00
inet_diag: add const to inet_diag_req_v2
2015-03-10 13:45:28 -04:00
kasan: enable stack instrumentation
2015-02-13 21:21:41 -08:00
genirq / PM: Add flag for shared NO_SUSPEND interrupt lines
2015-03-04 21:42:19 +01:00
ipv6: introduce secret_stable to ipv6_devconf
2015-03-23 22:12:08 -04:00
genirq / PM: Add flag for shared NO_SUSPEND interrupt lines
2015-03-04 21:42:19 +01:00
jhash: Update jhash_[321]words functions to use correct initval
2015-04-03 12:52:29 -04:00
kasan, module: move MODULE_ALIGN macro into <linux/moduleloader.h>
2015-03-12 18:46:08 -07:00
kdb: Avoid printing KERN_ levels to consoles
2015-02-19 12:39:02 -06:00
kernel.h: remove ancient __FUNCTION__ hack
2015-02-12 18:54:13 -08:00
kernfs: remove KERNFS_STATIC_NAME
2015-02-13 21:21:36 -08:00
kexec: add IND_FLAGS macro
2015-02-17 14:34:51 -08:00
Fairly small update, but there are some interesting new features.
2015-02-13 09:55:09 -08:00
block: fix blk_stack_limits() regression due to lcm() change
2015-03-31 09:45:50 -06:00
leds: Add LED Flash class extension to the LED subsystem
2015-01-26 14:59:08 -08:00
leds: Add LED Flash class extension to the LED subsystem
2015-01-26 14:59:08 -08:00
lguest: remove NOTIFY call and eventfd facility.
2015-02-11 16:47:46 +10:30
ata: Add a new flag to destinguish sas controller
2015-03-19 14:14:43 -04:00
memcg: reparent list_lrus and free kmemcg_id on css offline
2015-02-12 18:54:10 -08:00
livepatch: rename config to CONFIG_LIVEPATCH
2015-02-04 11:25:51 +01:00
list_lru: introduce per-memcg lists
2015-02-12 18:54:09 -08:00
mm: numa: do not dereference pmd outside of the lock during NUMA hinting fault
2015-02-12 18:54:08 -08:00
mm: allow page fault handlers to perform the COW
2015-02-16 17:56:03 -08:00
mm: account pmd page tables to the process
2015-02-11 17:06:04 -08:00
mm: microoptimize zonelist operations
2015-02-11 17:06:02 -08:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-02-17 17:41:19 -08:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching
2015-03-18 10:46:39 -07:00
kasan, module: move MODULE_ALIGN macro into <linux/moduleloader.h>
2015-03-12 18:46:08 -07:00
mutex: remove unused field "name" in debug mode
2015-02-14 11:32:59 -08:00
net: Remove iocb argument from sendmsg and recvmsg
2015-03-02 13:06:31 -05:00
netdev: introduce new NETIF_F_HW_SWITCH_OFFLOAD feature flag for switch device offloads
2015-02-01 23:16:33 -08:00
netdevice.h: remove iflink description
2015-04-07 17:30:45 -04:00
netfilter: Pass socket pointer down through okfn().
2015-04-07 15:25:55 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2015-04-08 18:30:21 +02:00
Merge branch 'for-3.20' of git://linux-nfs.org/~bfields/linux
2015-02-12 10:39:41 -08:00
NFS: Fix a regression in the read() syscall
2015-03-03 13:02:29 -05:00
nfsv3: introduce nfs3_set_ds_client
2015-02-03 11:06:34 -08:00
pnfs/flexfiles: Add the FlexFile Layout Driver
2015-02-03 11:06:52 -08:00
nfs: add mirroring support to pgio layer
2015-02-03 11:06:45 -08:00
NFSv4.1: Clean up bind_conn_to_session
2015-02-18 13:11:09 -08:00
bitmap, cpumask, nodemask: remove dedicated formatting functions
2015-02-13 21:21:39 -08:00
NVMe: Fix potential corruption during shutdown
2015-02-19 16:15:37 -07:00
of: mdio: export of_mdio_parse_addr
2015-03-11 17:56:28 -04:00
net: core: add of_find_net_device_by_node()
2015-03-09 23:50:20 -04:00
of/platform: Fix sparc:allmodconfig build
2015-03-13 09:45:24 -05:00
oom, PM: make OOM detection in the freezer path raceless
2015-02-11 17:06:03 -08:00
mm: add 'foreign' alias for the 'pinned' page flag
2015-01-28 14:03:09 +00:00
mm: page_counter: pull "-1" handling out of page_counter_memparse()
2015-02-11 17:06:02 -08:00
mm/page_owner.c: remove unnecessary stack_trace field
2015-02-11 17:06:07 -08:00
ACPI and power management updates for v3.20-rc1
2015-02-10 15:09:41 -08:00
Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2015-02-16 14:58:12 -08:00
net: phy: keep track of the PHY suspend state
2015-01-27 00:16:51 -08:00
add fixed_phy_update_state() - update state of fixed_phy
2015-04-03 15:08:20 -04:00
PM: Convert dev_pm_put_subsys_data() into a void function
2015-02-03 22:59:25 +01:00
PM / Domains: Eliminate the mutex for the generic_pm_domain_data
2015-02-03 22:56:53 +01:00
PNP: Allow console to override ACPI device sleep
2015-02-02 10:11:25 -08:00
hexdump: make it return number of bytes placed in buffer
2015-02-12 18:54:15 -08:00
ptp: remove 32 bit get/set methods.
2015-03-31 12:01:19 -04:00
quota: Store maximum space limit in bytes
2015-01-30 12:51:21 +01:00
quota: Add ->quota_{enable,disable} callbacks for VFS quotas
2015-01-30 12:50:32 +01:00
lib/rbtree.c: fix typo in comment
2015-02-17 14:34:52 -08:00
regmap: correct the description of structure element in reg_field
2015-01-27 13:13:04 +00:00
resources: Move struct resource_list_entry from ACPI into resource core
2015-02-05 15:09:25 +01:00
rhashtable: provide len to obj_hashfn
2015-03-25 17:18:33 +01:00
vfs: remove get_xip_mem
2015-02-16 17:56:03 -08:00
mm: numa: slow PTE scan rate if migration failures occur
2015-03-25 16:20:31 -07:00
Revert "selinux: add a skb_owned_by() hook"
2015-03-20 21:36:53 -04:00
bitmap, cpumask, nodemask: remove dedicated formatting functions
2015-02-13 21:21:39 -08:00
bitmap, cpumask, nodemask: remove dedicated formatting functions
2015-02-13 21:21:39 -08:00
serial: 8250: Use canary to restart console after suspend
2015-02-02 10:11:27 -08:00
serial: uapi: Declare all userspace-visible io types
2015-03-07 03:39:55 +01:00
vmscan: per memory cgroup slab shrinkers
2015-02-12 18:54:09 -08:00
netfilter: bridge: make BRNF_PKT_TYPE flag a bool
2015-04-08 16:49:12 +02:00
mm: slub: add kernel address sanitizer support for slub allocator
2015-02-13 21:21:41 -08:00
slab: embed memcg_cache_params to kmem_cache
2015-02-12 18:54:09 -08:00
mm: slub: share object_err function
2015-02-13 21:21:41 -08:00
net: add real socket cookies
2015-03-11 21:55:28 -04:00
net: socket: add support for async operations
2015-03-23 16:41:36 -04:00
mm/util: add kstrdup_const
2015-02-13 21:21:35 -08:00
libstring_helpers.c:string_get_size(): return void
2015-02-12 18:54:13 -08:00
PM / sleep: Re-implement suspend-to-idle handling
2015-02-13 23:49:36 +01:00
swap: remove unused mem_cgroup_uncharge_swapcache declaration
2015-02-11 17:06:00 -08:00
mm: remove remaining references to NUMA hinting bits and helpers
2015-02-12 18:54:08 -08:00
syscalls: Declare sys_*stat64 prototypes if __ARCH_WANT_(COMPAT_)STAT64
2015-01-27 09:38:00 +00:00
tcp: RFC7413 option support for Fast Open client
2015-04-07 18:36:39 -04:00
thermal: Introduce dummy functions when thermal is not defined
2015-02-24 14:40:42 -04:00
ti-st: clean up data types (fix harmless memory corruption)
2015-02-03 15:48:51 -08:00
PM / sleep: Make it possible to quiesce timers during suspend-to-idle
2015-02-15 19:40:09 +01:00
tracing: Add condition check to RCU lockdep checks
2015-02-07 19:34:25 -05:00
tty: Remove external interface for tty_set_termios()
2015-02-02 10:11:28 -08:00
linux/types.h: Always use unsigned long for pgoff_t
2015-02-12 18:54:13 -08:00
netns: constify net_hash_mix() and various callers
2015-03-18 22:00:34 -04:00
new helper: dup_iter()
2015-02-17 22:21:11 -05:00
vfio: Add and use device request op for vfio bus drivers
2015-02-10 12:37:47 -07:00
kasan, module, vmalloc: rework shadow allocation for modules
2015-03-12 18:46:08 -07:00
vmci: propagate msghdr all way down to __qp_memcpy_to_queue()
2015-02-04 01:34:14 -05:00
vt_buffer: drop console buffer copying optimisations
2015-02-02 10:09:54 -08:00
Merge branch 'for-3.20/drivers' of git://git.kernel.dk/linux-block
2015-02-12 14:30:53 -08:00
workqueue: fix hang involving racing cancel[_delayed]_work_sync()'s for PREEMPT_NONE
2015-03-05 08:04:13 -05:00
fs: add dirtytime_expire_seconds sysctl
2015-03-17 12:23:32 -04:00
mm/zpool: add name argument to create zpool
2015-02-12 18:54:12 -08:00
mm/zpool: add name argument to create zpool
2015-02-12 18:54:12 -08:00
