David S. Miller
11afbff861
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, mostly from Florian Westphal to sort out the lack of sufficient
validation in x_tables and connlabel preparation patches to add
nf_tables support. They are:
1) Ensure we don't go over the ruleset blob boundaries in
mark_source_chains().
2) Validate that target jumps land on an existing xt_entry. This extra
sanitization comes with a performance penalty when loading the ruleset.
3) Introduce xt_check_entry_offsets() and use it from {arp,ip,ip6}tables.
4) Get rid of the smallish check_entry() functions in {arp,ip,ip6}tables.
5) Make sure the minimal possible target size in x_tables.
6) Similar to #3 , add xt_compat_check_entry_offsets() for compat code.
7) Check that standard target size is valid.
8) More sanitization to ensure that the target_offset field is correct.
9) Add xt_check_entry_match() to validate that matches are well-formed.
10-12) Three patch to reduce the number of parameters in
translate_compat_table() for {arp,ip,ip6}tables by using a container
structure.
13) No need to return value from xt_compat_match_from_user(), so make
it void.
14) Consolidate translate_table() so it can be used by compat code too.
15) Remove obsolete check for compat code, so we keep consistent with
what was already removed in the native layout code (back in 2007).
16) Get rid of target jump validation from mark_source_chains(),
obsoleted by #2 .
17) Introduce xt_copy_counters_from_user() to consolidate counter
copying, and use it from {arp,ip,ip6}tables.
18,22) Get rid of unnecessary explicit inlining in ctnetlink for dump
functions.
19) Move nf_connlabel_match() to xt_connlabel.
20) Skip event notification if connlabel did not change.
21) Update of nf_connlabels_get() to make the upcoming nft connlabel
support easier.
23) Remove spinlock to read protocol state field in conntrack.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
2016-04-24 00:12:08 -04:00
mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros
2016-04-04 10:41:08 -07:00
The clk changes for this release cycle are mostly dominated by
2016-03-23 06:06:45 -07:00
MMC core:
2016-03-21 14:35:52 -07:00
net/mlx4_core: Avoid repeated calls to pci enable/disable
2016-04-21 15:02:40 -04:00
net/mlx5e: Support RX multi-packet WQE (Striding RQ)
2016-04-21 15:09:05 -04:00
mtd: nand: don't select chip in nand_chip's block_bad op
2016-03-10 10:52:21 -08:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next
2016-04-24 00:12:08 -04:00
MTD updates for v4.6
2016-03-24 19:57:15 -07:00
power supply and reset changes for the v4.6 series
2016-03-17 12:50:55 -07:00
qed: Add infrastructure support for tunneling
2016-04-15 17:08:08 -04:00
Merge remote-tracking branches 'regulator/topic/discharge', 'regulator/topic/fan53555', 'regulator/topic/gpio', 'regulator/topic/hi655x' and 'regulator/topic/lp872x' into regulator-next
2016-03-13 15:19:35 +07:00
mm: move max_map_count bits into mm.h
2016-03-17 15:09:34 -07:00
Merge branch 'mailbox-for-next' of git://git.linaro.org/landing-teams/working/fujitsu/integration
2016-03-23 06:09:15 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2016-03-17 21:51:52 -07:00
mm, fs: remove remaining PAGE_CACHE_* and page_cache_{get,release} usage
2016-04-04 10:41:08 -07:00
include/linux/unaligned: force inlining of byteswap operations
2016-03-17 15:09:34 -07:00
ath9k: Allow platform override BTCoex pin
2016-03-11 14:00:03 +02:00
locking/atomic, sched: Unexport fetch_or()
2016-03-29 11:52:11 +02:00
autofs4: fix string.h include in auto_dev-ioctl.h
2016-03-15 16:55:16 -07:00
autofs4: coding style fixes
2016-03-15 16:55:16 -07:00
mm, fs: remove remaining PAGE_CACHE_* and page_cache_{get,release} usage
2016-04-04 10:41:08 -07:00
mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros
2016-04-04 10:41:08 -07:00
blk-mq: Use proper cpumask iterator
2016-03-20 09:34:02 -06:00
mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros
2016-04-04 10:41:08 -07:00
bpf: add event output helper for notifications/sampling/logging
2016-04-19 20:26:11 -04:00
net: phy: bcm7xxx: Add entries for Broadcom BCM7346 and BCM7362
2016-03-25 11:37:57 -04:00
mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros
2016-04-04 10:41:08 -07:00
cred/userns: define current_user_ns() as a function
2016-03-22 15:36:02 -07:00
crypto: ccp - CCP versioning support
2016-03-11 21:19:16 +08:00
cgroup: ignore css_sets associated with dead cgroups during migration
2016-03-16 13:31:46 -07:00
mm, compaction: introduce kcompactd
2016-03-17 15:09:34 -07:00
compat: add in_compat_syscall to ask whether we're in a compat syscall
2016-03-22 15:36:02 -07:00
compiler-gcc: disable -ftracer for __noclone functions
2016-04-05 14:19:08 +02:00
Merge commit 'fixes.2015.02.23a' into core/rcu
2016-03-15 09:01:06 +01:00
configfs: fix CONFIGFS_BIN_ATTR_[RW]O definitions
2016-03-25 19:10:03 +01:00
Merge branch 'pm-cpufreq-governor' into pm-cpufreq
2016-03-10 20:46:03 +01:00
cpumask: remove incorrect information from comment
2016-03-22 15:36:02 -07:00
cred/userns: define current_user_ns() as a function
2016-03-22 15:36:02 -07:00
fs: add file_dentry()
2016-03-26 16:14:37 -04:00
dm snapshot: disallow the COW and origin devices from being identical
2016-03-10 17:12:09 -05:00
The clk changes for this release cycle are mostly dominated by
2016-03-23 06:06:45 -07:00
devpts: clean up interface to pty drivers
2016-04-18 13:43:02 -07:00
dma-buf, drm, ion: Propagate error code from dma_buf_start_cpu_access()
2016-03-19 11:03:49 +01:00
virtio/vhost: new features, performance improvements, cleanups
2016-03-20 13:28:18 -07:00
Merge branch 'topic/pl330' into for-linus
2016-03-14 11:18:12 +05:30
Merge branch 'efi-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2016-03-20 18:58:18 -07:00
net: ethtool: export conversion function between u32 and link mode
2016-04-18 14:45:08 -04:00
mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros
2016-04-04 10:41:08 -07:00
mm: fault-inject take over bootstrap kmem_cache check
2016-03-15 16:55:16 -07:00
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
2016-03-25 08:48:31 -07:00
tun: use socket locks for sk_{attach,detatch}_filter
2016-04-07 16:44:14 -04:00
timer: convert timer_slack_ns from unsigned long to u64
2016-03-17 15:09:34 -07:00
These changes contains a fix for overlayfs interacting with some
2016-04-07 17:22:20 -07:00
fscrypto: don't let data integrity writebacks fail with ENOMEM
2016-04-12 10:25:30 -07:00
untangle fsnotify_d_instantiate() a bit
2016-03-14 00:17:28 -04:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2016-03-19 18:52:29 -07:00
arch, ftrace: for KASAN put hard/soft IRQ entries into separate sections
2016-03-25 16:37:42 -07:00
mm: exclude ZONE_DEVICE from GFP_ZONE_TABLE
2016-03-17 15:09:34 -07:00
timer: convert timer_slack_ns from unsigned long to u64
2016-03-17 15:09:34 -07:00
include/linux/huge_mm.h: return NULL instead of false for pmd_trans_huge_lock()
2016-04-01 17:03:37 -05:00
mac80211: add A-MSDU tx support
2016-04-06 13:18:19 +02:00
bridge: allow zero ageing time
2016-03-11 14:58:58 -05:00
arch, ftrace: for KASAN put hard/soft IRQ entries into separate sections
2016-03-25 16:37:42 -07:00
memremap: add MEMREMAP_WC flag
2016-03-22 15:36:02 -07:00
iommu: provide of_xlate pointer unconditionally
2016-04-05 13:25:12 +02:00
libnvdimm for 4.6
2016-03-16 17:45:56 -07:00
net/ipv6/addrconf: simplify sysctl registration
2016-04-19 20:13:19 -04:00
Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2016-03-15 12:48:48 -07:00
Staging driver patches for 4.6-rc1
2016-03-17 22:13:41 -07:00
iscsi_ibft: Add prefix-len attr and display netmask
2016-03-14 10:30:57 -04:00
mm, kasan: add GFP flags to KASAN API
2016-03-25 16:37:42 -07:00
kernel: add kcov code coverage
2016-03-22 15:36:02 -07:00
Nothing major this round. Mostly small clean ups and fixes.
2016-03-24 10:52:25 -07:00
kfifo: fix sparse complaints
2016-03-22 15:36:02 -07:00
leds: core: avoid error message when a USB LED device is unplugged
2016-03-14 09:22:20 +01:00
nvme: lightnvm: return ppa completion status
2016-03-18 18:10:38 -07:00
include/linux/list_bl.h: use bool instead of int for boolean functions
2016-03-17 15:09:34 -07:00
livepatch/module: remove livepatch module notifier
2016-03-17 09:45:10 +01:00
bus: mvebu-mbus: provide api for obtaining IO and DRAM window information
2016-03-14 12:19:46 -04:00
net: mdio: Fix lockdep falls positive splat
2016-04-11 21:15:48 -04:00
mm: workingset: make shadow node shrinker memcg aware
2016-03-17 15:09:34 -07:00
Char/Misc patches for 4.6-rc1
2016-03-17 13:47:50 -07:00
mm/compaction: speed up pageblock_pfn_to_page() when zone is contiguous
2016-03-15 16:55:16 -07:00
mm, page_owner: track and print last migrate reason
2016-03-15 16:55:16 -07:00
isdn: Use ktime_t instead of 'struct timeval'
2016-03-20 16:47:13 -04:00
Merge branch 'mm-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2016-04-14 19:31:34 -07:00
mm, fs: remove remaining PAGE_CACHE_* and page_cache_{get,release} usage
2016-04-04 10:41:08 -07:00
mm, debug: move bad flags printing to bad_page()
2016-03-15 16:55:16 -07:00
mm: scale kswapd watermarks in proportion to memory
2016-03-17 15:09:34 -07:00
namei: teach lookup_slow() to skip revalidate
2016-03-14 00:15:46 -04:00
[net] drop 'size' argument of sock_recvmsg()
2016-03-28 13:57:51 -04:00
netdev_features: Fold NETIF_F_ALL_TSO into NETIF_F_GSO_SOFTWARE
2016-04-21 14:14:58 -04:00
geneve: break dependency with netdev drivers
2016-04-21 15:35:44 -04:00
nfs4.h: add SCSI layout definitions
2016-03-17 14:57:16 -04:00
mm, fs: remove remaining PAGE_CACHE_* and page_cache_{get,release} usage
2016-04-04 10:41:08 -07:00
mm, fs: remove remaining PAGE_CACHE_* and page_cache_{get,release} usage
2016-04-04 10:41:08 -07:00
x86/apic: Remove declaration of unused hw_nmi_is_cpu_stuck
2016-03-23 12:34:17 +01:00
NTB: Make _addr functions optional in the API
2016-03-21 19:30:06 -04:00
DeviceTree updates for 4.6:
2016-03-19 15:15:07 -07:00
include/linux/oom.h: remove undefined oom_kills_count()/note_oom_kill()
2016-03-25 16:37:42 -07:00
mm: exclude ZONE_DEVICE from GFP_ZONE_TABLE
2016-03-17 15:09:34 -07:00
include/linux/page-flags.h: force inlining of selected page flag modifications
2016-03-17 15:09:34 -07:00
mm, page_owner: track and print last migrate reason
2016-03-15 16:55:16 -07:00
mm, page_owner: dump page owner info from dump_page()
2016-03-15 16:55:16 -07:00
mm/page_ref: add tracepoint to track down page reference manipulation
2016-03-17 15:09:34 -07:00
mm: drop PAGE_CACHE_* and page_cache_{get,release} definition
2016-04-04 10:41:08 -07:00
PCI: Add pci_set_vpd_size() to set VPD size
2016-04-15 13:00:11 -05:00
PCI: Add PCI_CLASS_SERIAL_USB_DEVICE definition
2016-03-15 08:52:28 -05:00
perf: split perf_trace_buf_prepare into alloc and update parts
2016-04-07 21:04:26 -04:00
phy: add generic function to support ksetting support
2016-04-18 14:45:08 -04:00
phy: fixed: Fix removal of phys.
2016-03-14 15:43:11 -04:00
PM / clk: Add support for obtaining clocks from device-tree
2016-03-17 02:32:04 +01:00
pmem: fix BUG() error in pmem.h:48 on X86_32
2016-04-14 09:01:47 -06:00
mm/page_poisoning.c: allow for zero poisoning
2016-03-15 16:55:16 -07:00
timer: convert timer_slack_ns from unsigned long to u64
2016-03-17 15:09:34 -07:00
pstore: Add support for 64 Bit address space
2016-03-10 09:43:36 -08:00
fix Christoph's email addresses
2016-03-17 15:09:34 -07:00
radix-tree,shmem: introduce radix_tree_iter_next()
2016-03-17 15:09:34 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2016-04-23 18:51:33 -04:00
soreuseport: fix ordering for mixed v4/v6 sockets
2016-04-14 21:14:03 -04:00
Merge branch 'smp-hotplug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2016-03-15 13:50:29 -07:00
rhashtable: accept GFP flags in rhashtable_walk_init
2016-04-05 10:56:32 +02:00
rapidio: add outbound window support
2016-03-22 15:36:02 -07:00
rapidio: add outbound window support
2016-03-22 15:36:02 -07:00
rapidio: add mport char device driver
2016-03-22 15:36:02 -07:00
rapidio: add query_mport operation
2016-03-22 15:36:02 -07:00
mm: make remove_migration_ptes() beyond mm/migration.c
2016-03-17 15:09:34 -07:00
Input: synaptics-rmi4 - add SPI transport driver
2016-03-10 16:04:24 -08:00
rtc: Add functions to set and read rtc offset
2016-03-14 17:08:15 +01:00
timers/nohz: Convert tick dependency mask to atomic_t
2016-03-29 11:52:11 +02:00
sctp: add sctp_info dump api for sctp_diag
2016-04-15 17:29:35 -04:00
Make file credentials available to the seqfile interfaces
2016-04-14 12:56:09 -07:00
GSO: Support partial segmentation offload
2016-04-14 16:23:41 -04:00
mm, kasan: add GFP flags to KASAN API
2016-03-25 16:37:42 -07:00
mm, kasan: SLAB support
2016-03-25 16:37:42 -07:00
mm, kasan: SLAB support
2016-03-25 16:37:42 -07:00
mm, kasan: stackdepot implementation. Enable stackdepot for SLAB
2016-03-25 16:37:42 -07:00
stmmac: add new DT platform entries for GMAC4
2016-04-02 20:23:09 -04:00
lib: move strtobool() to kstrtobool()
2016-03-17 15:09:34 -07:00
mm, fs: remove remaining PAGE_CACHE_* and page_cache_{get,release} usage
2016-04-04 10:41:08 -07:00
tcp: Add RFC4898 tcpEStatsPerfDataSegsOut/In
2016-03-14 14:55:26 -04:00
Thermal: Ignore invalid trip points
2016-03-18 14:10:57 +08:00
param: convert some "on"/"off" users to strtobool
2016-03-17 15:09:34 -07:00
perf, bpf: minimize the size of perf_trace_() tracepoint handler
2016-04-21 13:48:20 -04:00
tracepoints: move trace_print_flags definitions to tracepoint-defs.h
2016-03-15 16:55:16 -07:00
udp: Add GRO functions to UDP socket
2016-04-07 16:53:29 -04:00
USB: uas: Add a new NO_REPORT_LUNS quirk
2016-04-13 12:02:28 -07:00
thp, vmstats: count deferred split events
2016-03-17 15:09:34 -07:00
watchdog: Add support for minimum time between heartbeats
2016-03-16 21:11:19 +01:00
