David S. Miller
a9e01ed986
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next ...
Pablo Neira Ayuso says:
====================
Netfilter updates for net-next
This is second pull request includes the conflict resolution patch that
resulted from the updates that we got for the conntrack template through
kmalloc. No changes with regards to the previously sent 15 patches.
The following patchset contains Netfilter updates for your net-next tree, they
are:
1) Rework the existing nf_tables counter expression to make it per-cpu.
2) Prepare and factor out common packet duplication code from the TEE target so
it can be reused from the new dup expression.
3) Add the new dup expression for the nf_tables IPv4 and IPv6 families.
4) Convert the nf_tables limit expression to use a token-based approach with
64-bits precision.
5) Enhance the nf_tables limit expression to support limiting at packet byte.
This comes after several preparation patches.
6) Add a burst parameter to indicate the amount of packets or bytes that can
exceed the limiting.
7) Add netns support to nfacct, from Andreas Schultz.
8) Pass the nf_conn_zone structure instead of the zone ID in nf_tables to allow
accessing more zone specific information, from Daniel Borkmann.
9) Allow to define zone per-direction to support netns containers with
overlapping network addressing, also from Daniel.
10) Extend the CT target to allow setting the zone based on the skb->mark as a
way to support simple mappings from iptables, also from Daniel.
11) Make the nf_tables payload expression aware of the fact that VLAN offload
may have removed a vlan header, from Florian Westphal.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-08-20 22:18:45 -07:00
android: uapi: binder.h
2014-10-20 10:30:15 +08:00
caif: Remove my bouncing email address.
2013-04-23 13:25:51 -04:00
can: cangw: introduce optional uid to reference created routing jobs
2015-06-09 09:39:49 +02:00
cifs: Move and expand MAX_SERVER_SIZE definition
2013-09-08 14:34:22 -05:00
[media] DocBook: Change format for enum dmx_output documentation
2015-06-09 17:47:38 -03:00
GenWQE: Update author information
2014-09-23 23:15:46 -07:00
HSI: cmt_speech: fix timestamp interface
2015-06-23 02:40:03 +02:00
iio: Add I/Q modifiers
2015-05-23 10:49:55 +01:00
netfilter: nf_conntrack: add efficient mark to zone mapping
2015-08-18 01:24:05 +02:00
uapi: netfilter_arp: use __u8 instead of u_int8_t
2014-08-20 15:13:08 +02:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2015-06-23 14:08:54 -07:00
netfilter: kill ulog targets
2014-06-25 19:28:43 +02:00
netfilter: fix struct ip6t_frag field description
2013-04-02 12:25:57 +02:00
nfsd: eliminate NFSD_DEBUG
2015-04-21 16:16:02 -04:00
Add new disk to clustered array
2015-02-23 09:59:07 -06:00
spi: spidev: Add support for Dual/Quad SPI Transfers
2014-02-27 13:51:29 +09:00
act_bpf: add initial eBPF support for actions
2015-03-20 19:10:44 -04:00
usb: gadget: ffs: add eventfd notification about ffs events
2015-01-27 09:34:59 -06:00
uapi: Convert some uses of 6 to ETH_ALEN
2013-08-02 12:33:54 -07:00
UAPI: fix endianness conditionals in linux/acct.h
2013-03-13 15:21:48 -07:00
UAPI: fix endianness conditionals in linux/aio_abi.h
2013-03-13 15:21:48 -07:00
[media] am437x: include linux/videodev2.h for expanding BASE_VIDIOC_PRIVATE
2015-04-02 18:10:35 -03:00
apm-emulation: add hibernation APM events to support suspend2disk
2014-01-07 13:50:28 +01:00
powerpc updates for 3.19 batch 2
2014-12-19 12:57:45 -08:00
powerpc: Add HWCAP2 aux entry
2013-04-26 16:08:16 +10:00
bcache: Add bch_btree_keys_u64s_remaining()
2014-01-08 13:05:13 -08:00
MIPS: BCM63XX: recognize Cable Modem firmware format
2013-07-01 15:10:53 +02:00
bpf: Implement function bpf_perf_event_read() that get the selected hardware PMU conuter
2015-08-09 22:50:06 -07:00
net: filter: move common defines into bpf_common.h
2014-10-14 16:06:45 -04:00
block SG_IO: add SG_FLAG_Q_AT_HEAD flag
2014-07-01 10:48:05 -06:00
Btrfs: Remove unnecessary placeholder in btrfs_err_code
2015-02-02 19:25:51 -08:00
can.h: make padding given by gcc explicit
2015-05-06 08:03:19 +02:00
audit: add netlink audit protocol bind to check capabilities on multicast join
2014-04-22 21:42:27 -04:00
isdn: capi: fix "CAPI_VERSION" comment
2014-03-20 14:55:18 +01:00
Omnikey Cardman 4000: pull in ioctl.h in user header
2013-08-28 19:26:38 -07:00
connector: Added coredumping event to the process connector
2013-03-20 13:23:21 -04:00
Drivers: hv: Add a new driver to support host initiated backup
2013-03-15 12:12:36 -07:00
linux/const.h: Add _BITUL() and _BITULL()
2013-06-25 15:50:04 -07:00
crypto: user - Add CRYPTO_MSG_DELRNG
2015-06-22 15:49:27 +08:00
dcb : Fix incorrect documentation for struct dcb_app
2015-06-23 07:00:41 -07:00
dlm: adopt orphan locks
2014-11-19 14:48:02 -06:00
dm: bump the ioctl version to 4.32.0
2015-06-26 10:14:28 -04:00
dm log userspace: allow mark requests to piggyback on flush requests
2014-01-21 23:46:27 -05:00
include/uapi/linux/dn.h: pull in ioctl.h header
2014-01-23 16:36:55 -08:00
quota: Add a new quotactl command Q_XGETQSTATV
2013-08-20 16:53:58 -05:00
Add ELF machine
2015-06-23 13:35:47 +09:00
arm64: ptrace: add NT_ARM_SYSTEM_CALL regset
2014-11-28 10:19:49 +00:00
net-timestamp: ACK timestamp for bytestreams
2014-08-05 16:35:54 -07:00
clarify implementation of ethtool's get_ts_info op
2015-07-17 19:59:04 -07:00
epoll: drop EPOLLWAKEUP if PM_SLEEP is disabled
2013-12-03 15:35:52 +01:00
fs: Add support FALLOC_FL_INSERT_RANGE for fallocate
2015-03-25 15:07:05 +11:00
shm: add sealing API
2014-08-08 15:57:31 -07:00
floppy: bail out in open() if drive is not responding to block0 read
2014-01-17 11:12:06 +01:00
fib: Add fib rule match on tunnel id
2015-07-21 10:39:06 -07:00
ext4: add support for extent pre-caching
2013-08-16 22:05:14 -04:00
bpf: fix bpf helpers to use skb->mac_header relative offsets
2015-04-16 14:08:49 -04:00
firewire: fix libdc1394/FlyCap2 iso event regression
2013-07-27 20:24:36 +02:00
fou: implement FOU_CMD_GET
2015-04-12 21:25:13 -04:00
vfs: add support for a lazytime mount option
2015-02-05 02:45:00 -05:00
fuse: device fd clone
2015-07-01 16:26:08 +02:00
net_sched: add 64bit rate estimators
2013-06-11 02:51:03 -07:00
genetlink/pmcraid: use proper genetlink multicast API
2013-11-28 18:26:30 -05:00
GFS2: remove transaction glock
2014-05-14 10:04:34 +01:00
tty: move linux/gsmmux.h to uapi
2015-06-01 10:45:51 +09:00
crypto: provide single place for hash algo information
2013-10-25 17:14:03 -04:00
net/hsr: Add support for the High-availability Seamless Redundancy protocol (HSRv0)
2013-11-03 23:20:14 -05:00
Drivers: hv: fcopy: full handshake support
2015-05-24 12:17:42 -07:00
i2c: add FUNC flag for slave capabilities
2015-06-01 08:07:08 +09:00
i8k: uapi: Introduce define for new highest fan speed
2014-07-09 16:41:36 -07:00
ICMPv6: treat dest unreachable codes 5 and 6 as EACCES, not EPROTO
2013-09-03 22:11:44 -04:00
net: move net_device priv_flags out from UAPI
2014-02-27 15:59:09 -05:00
ipv6: introduce IFA_F_STABLE_PRIVACY flag
2015-03-23 22:12:09 -04:00
crypto: af_alg - add user space interface for AEAD
2014-12-05 23:56:55 +08:00
net: if_arp: add ARPHRD_6LOWPAN type
2013-12-11 12:57:55 -08:00
bonding: modify the old and add new xmit hash policies
2013-10-03 15:36:38 -04:00
bridge: mdb: add vlan support for user entries
2015-07-13 14:41:26 -07:00
if_cablemodem.h: Add parenthesis around ioctl macros
2013-05-08 13:13:30 -07:00
net: dsa: reduce number of protocol hooks
2014-08-27 22:59:39 -07:00
FDDI: Reformat <linux/if_fddi.h> for 8-character tabs
2014-04-27 19:08:06 -04:00
net: Introduce VRF related flags and helpers
2015-08-13 22:43:20 -07:00
packet: add extended BPF fanout mode
2015-08-17 14:22:48 -07:00
pptp: fix byte order warnings
2013-08-13 15:10:22 -07:00
macvtap/tun: cross-endian support for little-endian hosts
2015-06-01 15:48:56 +02:00
ip_gre: Add support to collect tunnel metadata.
2015-08-10 14:03:54 -07:00
net: Identifier Locator Addressing module
2015-08-17 21:33:06 -07:00
api: fix compatibility of linux/in.h with netinet/in.h
2015-06-29 18:56:21 -07:00
in6: fix conflict with glibc
2014-12-22 16:12:36 -05:00
net: inet_diag: export IPV6_V6ONLY sockopt
2015-06-24 02:51:39 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2015-04-14 18:25:15 -07:00
net: ipv4 sysctl option to ignore routes when nexthop link is down
2015-06-24 02:15:54 -07:00
ipvs: use 64-bit rates in stats
2015-02-09 16:59:03 +09:00
ipmi: remove superfluous kernel/userspace explanation
2013-02-27 19:10:21 -08:00
net: ipv6 sysctl option to ignore routes when nexthop link is down
2015-08-13 21:27:19 -07:00
ipv6: Create percpu rt6_info
2015-05-25 13:25:35 -04:00
lwtunnel: export linux/lwtunnel.h to userspace
2015-07-26 21:45:54 -07:00
kcmp: Move kcmp.h into uapi
2014-12-02 13:52:53 -07:00
mm:add KPF_ZERO_PAGE flag for /proc/kpageflags
2015-02-11 17:06:00 -08:00
kexec: Fix make headers_check
2015-02-17 14:34:51 -08:00
KEYS: Add per-user_namespace registers for persistent per-UID kerberos caches
2013-09-24 10:35:19 +01:00
drm/amdkfd: add H/W debugger IOCTL set definitions
2015-06-03 11:32:07 +03:00
KVM/ARM changes for v4.2:
2015-06-19 17:15:24 +02:00
MIPS: Add functions for hypervisor call
2014-05-30 21:01:11 +02:00
l2tp : multicast notification to the registered listeners
2014-12-31 14:17:20 -05:00
api: fix compatibility of linux/in.h with netinet/in.h
2015-06-29 18:56:21 -07:00
ipv6: route: per route IP tunnel metadata via lightweight tunnel
2015-08-20 15:42:38 -07:00
tracefs: Add new tracefs file system
2015-02-03 12:48:40 -05:00
mtd: Move major number definitions to major.h
2013-11-06 23:32:59 -08:00
Merge branch 'drm-next-merged' of git://people.freedesktop.org/~airlied/linux into v4l_for_linus
2015-04-21 09:44:55 -03:00
[media] media.h: mark alsa struct in media_entity_desc as TODO
2015-02-26 08:40:10 -03:00
shm: add memfd_create() syscall
2014-08-08 15:57:31 -07:00
mm: convert p[te|md]_numa users to p[te|md]_protnone_numa
2015-02-12 18:54:08 -08:00
misc: mic: Common MIC header file changes in preparation for SCIF
2015-05-24 12:13:36 -07:00
misc: mic: fix possible signed underflow (undefined behavior) in userspace API
2014-02-07 15:30:34 -08:00
mpls: Use definition for reserved label checks
2015-08-03 22:35:00 -07:00
mpls: ip tunnel support
2015-07-21 10:39:05 -07:00
uapi: Use __kernel_long_t in struct mq_attr
2014-01-20 14:45:33 -08:00
msdos_fs.h: fix 'fields' in comment
2015-01-20 13:51:06 +01:00
ipc/msg: increase MSGMNI, remove scaling
2014-12-13 12:42:52 -08:00
nbd: stop using req->cmd
2015-05-05 13:40:44 -06:00
libnvdimm: pmem label sets and namespace instantiation.
2015-06-24 21:24:10 -04:00
net: add explicit logging and stat for neighbour table overflow
2015-08-10 13:46:21 -07:00
netns: add rtnl cmd to add and get peer netns ids
2015-01-19 14:21:18 -05:00
net-timestamp: no-payload option
2015-02-02 18:46:51 -08:00
ipv4: add support for linkdown sysctl to netconf
2015-07-08 23:34:53 -07:00
net: add name_assign_type netdev attribute
2014-07-15 16:12:01 -07:00
netfilter: don't pull include/linux/netfilter.h from netns headers
2015-06-18 21:14:31 +02:00
netlink: add API to retrieve all group memberships
2015-06-21 10:18:18 -07:00
diag: warn about missing first netlink attribute
2013-11-28 18:16:43 -05:00
NFC: netlink: Implement vendor command support
2015-06-09 01:21:35 +02:00
uapi/nfs: Add NFSv4.1 ACL definitions
2015-06-01 10:25:37 -04:00
NFS: Move nfs_idmap.h into fs/nfs/
2015-04-23 15:16:14 -04:00
NFS: stop using NFS_MOUNT_SECFLAVOUR server flag
2013-10-28 15:37:56 -04:00
cfg80211: change GO_CONCURRENT to IR_CONCURRENT for STA
2015-05-06 15:50:02 +02:00
NVMe: Automatic namespace rescan
2015-06-05 10:58:34 -06:00
ip_tunnel: Make ovs_tunnel_info and ovs_key_ipv4_tunnel generic
2015-07-21 10:39:05 -07:00
diag: warn about missing first netlink attribute
2013-11-28 18:16:43 -05:00
PCI: Restore PCI_MSIX_FLAGS_BIRMASK definition
2015-07-14 18:27:46 -05:00
perf tools: Add time out to force stop proc map processing
2015-06-19 18:20:15 -03:00
ipsec: add support of limited SA dump
2014-02-17 07:18:19 +01:00
net: sched: pkt_cls: remove unused macros from uapi
2015-05-21 23:26:51 -04:00
net_sched: gred: add TCA_GRED_LIMIT attribute
2015-05-12 18:22:49 -04:00
include/uapi/linux/ppp-ioctl.h: pull in ppp_defs.h
2014-01-23 16:36:55 -08:00
MIPS,prctl: add PR_[GS]ET_FP_MODE prctl options for MIPS
2015-02-12 12:30:29 +01:00
ARM/ARM64: KVM: Add common header for PSCI related defines
2014-04-30 04:18:57 -07:00
ptp: introduce programmable pins.
2014-03-21 14:21:13 -04:00
ptrace: add ability to get/set signal-blocked mask
2013-07-03 16:08:01 -07:00
vfs: Add general support to enforce project quota limits
2015-03-18 21:55:08 +01:00
random: introduce getrandom(2) system call
2014-08-05 16:41:22 -04:00
net/rds: Declare SO_RDS_TRANSPORT and RDS_TRANS_* constants in uapi/linux/rds.h
2015-05-31 21:47:23 -07:00
xattr: Constify ->name member of "struct xattr".
2013-07-25 19:30:03 +10:00
uapi: Use __kernel_long_t/__kernel_ulong_t in <linux/resource.h>
2014-01-20 14:44:17 -08:00
rfkill: Add NFC to the list of supported radios
2013-04-12 16:54:38 +02:00
lwtunnel: rename ip lwtunnel attributes
2015-08-17 14:07:15 -07:00
sched: Update comments about CLONE_NEWUTS and CLONE_NEWIPC
2014-11-16 10:58:53 +01:00
misc: mic: SCIF header file and IOCTL interface
2015-05-24 12:13:36 -07:00
net: sctp: implement rfc6458, 8.1.31. SCTP_DEFAULT_SNDINFO support
2014-07-16 14:40:04 -07:00
seccomp: implement SECCOMP_FILTER_FLAG_TSYNC
2014-07-18 12:13:40 -07:00
ipc/sem.c: increase SEMMSL, SEMMNI, SEMOPM
2014-12-13 12:42:52 -08:00
serial: uapi: Declare all userspace-visible io types
2015-03-07 03:39:55 +01:00
serial: stm32-usart: Add STM32 USART Driver
2015-06-10 17:34:26 -07:00
ARM: OMAP1: Move UART defines to prepare for sparse IRQ
2015-05-20 09:01:20 -07:00
Input: add support for Wacom protocol 4 serial tablets
2014-07-20 14:33:23 -07:00
ipc,shm: document new limits in the uapi header
2014-06-06 16:08:14 -07:00
[media] smiapp: Add driver-specific test pattern menu item definitions
2014-08-21 15:25:11 -05:00
net: track success and failure of TCP PMTU probing
2015-07-21 22:36:33 -07:00
sock_diag: define destruction multicast groups
2015-06-15 19:49:22 -07:00
net_tstamp: Add SIOCGHWTSTAMP ioctl to match SIOCSHWTSTAMP
2013-11-19 19:07:21 +00:00
kernel: add panic_on_warn
2014-12-10 17:41:10 -08:00
target: Version 2 of TCMU ABI
2015-04-19 22:40:26 -07:00
tcp: add tcpi_segs_in and tcpi_segs_out to tcp_info
2015-05-21 23:25:21 -04:00
tcp: switch rtt estimations to usec resolution
2014-02-26 17:08:40 -05:00
thermal: provide an UAPI header file
2014-12-09 14:10:41 +08:00
timekeeping: Add CLOCK_TAI clockid
2013-03-22 16:19:59 -07:00
uapi: Use __kernel_long_t in struct timex
2014-01-20 14:44:05 -08:00
tipc: add ioctl to fetch link names
2014-04-26 12:13:24 -04:00
tipc: convert legacy nl link stat to nl compat
2015-02-09 13:20:47 -08:00
tipc: add ip/udp media type
2015-03-05 22:08:42 -05:00
NFC: nci: add generic uart support
2015-06-11 23:37:37 +02:00
tty: fix comment of ASYNCB_SPD_HI
2015-05-24 12:49:16 -07:00
net: Make enabling of zero UDP6 csums more restrictive
2014-05-23 16:28:53 -04:00
HID: uhid: report to user-space whether reports are numbered
2014-08-25 03:28:08 -05:00
Input: uinput - fix ioctl nr overflow for UI_GET_SYSNAME/VERSION
2015-01-11 16:27:25 -08:00
diag: warn about missing first netlink attribute
2013-11-28 18:16:43 -05:00
USB: usbfs: allow URBs to be reaped after disconnection
2015-01-31 09:05:06 -08:00
usbip: move usbip kernel code out of staging
2014-08-25 10:40:06 -07:00
[media] v4l: Add V4L2_SEL_TGT_NATIVE_SIZE selection target
2014-12-04 12:37:01 -02:00
[media] adv7180: Add fast switch support
2015-02-02 11:51:38 -02:00
[media] videodev2.h/v4l2-dv-timings.h: add V4L2_DV_FL_IS_CE_VIDEO flag
2015-04-08 06:36:52 -03:00
[media] videodev2.h: add support for transfer functions
2015-06-05 11:45:45 -03:00
[media] v4l2-subdev.h: add 'which' field for the enum structs
2015-03-23 11:44:35 -07:00
vfio: powerpc/spapr: Support Dynamic DMA windows
2015-06-11 15:16:55 +10:00
vhost: cross-endian support for legacy devices
2015-06-01 15:48:55 +02:00
[media] videodev2.h: fix copy-and-paste error in V4L2_MAP_XFER_FUNC_DEFAULT
2015-06-18 14:34:46 -03:00
include/uapi/linux/virtio_balloon.h: include linux/virtio_types.h
2015-06-01 15:46:54 +02:00
virtio_blk: fix comment for virtio 1.0
2015-03-10 11:48:29 +10:30
virtio: Don't expose legacy config features when VIRTIO_CONFIG_NO_LEGACY defined.
2015-02-11 15:03:16 +10:30
virtio_console: virtio 1.0 support
2014-12-09 12:06:32 +02:00
virtgpu: include linux/types.h to avoid warning.
2015-06-05 12:31:12 +10:00
Add virtio gpu driver.
2015-06-03 14:17:38 +02:00
Add virtio-input driver.
2015-03-29 12:13:52 +10:30
virtio_net: document VIRTIO_NET_CTRL_GUEST_OFFLOADS
2015-07-01 10:11:17 +02:00
virtio: define virtio_pci_cfg_cap in header.
2015-07-07 14:27:05 +03:00
virtio: Fix typecast of pointer in vring_init()
2015-07-07 14:27:04 +03:00
uapi/virtio_scsi: allow overriding CDB/SENSE size
2015-03-13 15:55:43 +10:30
virtio: memory access APIs
2014-12-09 12:05:24 +02:00
VSOCK: Split vm_sockets.h into kernel/uapi
2013-03-08 12:24:48 -05:00
[media] v4l: vsp1: Add LUT support
2013-12-11 09:25:20 -02:00
vt: Remove vt_get_kmsg_redirect() from uapi header
2014-11-05 20:18:30 -08:00
wil6210: atomic I/O for the card memory
2014-10-02 14:23:14 -04:00
xattr: fix check for simultaneous glibc header inclusion
2014-08-29 16:28:16 -07:00
xfrm: simplify xfrm_address_t use
2015-03-31 13:58:35 -04:00
[media] v4l: xilinx: Add Test Pattern Generator driver
2015-04-03 01:04:18 -03:00
zorro/UAPI: Use proper types (endianness/size) in <linux/zorro.h>
2013-11-26 11:09:09 +01:00
zorro/UAPI: Disintegrate include/linux/zorro*.h
2013-11-26 11:09:08 +01:00
a9e01ed986