David S. Miller
1cdba55055
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next ...
Pablo Neira Ayuso says:
====================
Netfilter/IPVS/OVS updates for net-next
The following patchset contains Netfilter/IPVS fixes and OVS NAT
support, more specifically this batch is composed of:
1) Fix a crash in ipset when performing a parallel flush/dump with
set:list type, from Jozsef Kadlecsik.
2) Make sure NFACCT_FILTER_* netlink attributes are in place before
accessing them, from Phil Turnbull.
3) Check return error code from ip_vs_fill_iph_skb_off() in IPVS SIP
helper, from Arnd Bergmann.
4) Add workaround to IPVS to reschedule existing connections to new
destination server by dropping the packet and wait for retransmission
of TCP syn packet, from Julian Anastasov.
5) Allow connection rescheduling in IPVS when in CLOSE state, also
from Julian.
6) Fix wrong offset of SIP Call-ID in IPVS helper, from Marco Angaroni.
7) Validate IPSET_ATTR_ETHER netlink attribute length, from Jozsef.
8) Check match/targetinfo netlink attribute size in nft_compat,
patch from Florian Westphal.
9) Check for integer overflow on 32-bit systems in x_tables, from
Florian Westphal.
Several patches from Jarno Rajahalme to prepare the introduction of
NAT support to OVS based on the Netfilter infrastructure:
10) Schedule IP_CT_NEW_REPLY definition for removal in
nf_conntrack_common.h.
11) Simplify checksumming recalculation in nf_nat.
12) Add comments to the openvswitch conntrack code, from Jarno.
13) Update the CT state key only after successful nf_conntrack_in()
invocation.
14) Find existing conntrack entry after upcall.
15) Handle NF_REPEAT case due to templates in nf_conntrack_in().
16) Call the conntrack helper functions once the conntrack has been
confirmed.
17) And finally, add the NAT interface to OVS.
The batch closes with:
18) Cleanup to use spin_unlock_wait() instead of
spin_lock()/spin_unlock(), from Nicholas Mc Guire.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
2016-03-14 22:10:25 -04:00
android: uapi: binder.h
2014-10-20 10:30:15 +08:00
can: avoid using timeval for uapi
2015-10-13 17:42:34 +02:00
cifs: Move and expand MAX_SERVER_SIZE definition
2013-09-08 14:34:22 -05:00
[media] include/uapi/linux/dvb/video.h: remove stdint.h include
2015-11-19 08:18:38 -02: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: resistance: add IIO_RESISTANCE channel type
2015-09-23 20:23:25 +01:00
mmc: block: Add new ioctl to send multi commands
2015-10-26 16:00:00 +01:00
netfilter: Remove IP_CT_NEW_REPLY definition.
2016-03-14 23:47:27 +01:00
netfilter: fix include files for compilation
2015-11-23 17:54:38 +01:00
netfilter: fix include files for compilation
2015-11-23 17:54:38 +01:00
netfilter: fix include files for compilation
2015-11-23 17:54:38 +01:00
netfilter: fix include files for compilation
2015-11-23 17:54:38 +01:00
nfsd: eliminate NFSD_DEBUG
2015-04-21 16:16:02 -04:00
drivers: md: use ktime_get_real_seconds()
2016-01-06 11:39:53 +11:00
spi: spidev: Add support for Dual/Quad SPI Transfers
2014-02-27 13:51:29 +09:00
introduce IFE action
2016-03-01 17:15:22 -05:00
[media] uvcvideo: Enable UVC 1.5 device detection
2015-11-19 11:13:19 -02:00
include/uapi/linux/agpgart.h: include stdlib.h in userspace
2015-12-10 12:33:23 +01: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
atm: remove 'struct zatm_t_hist'
2015-10-05 03:16:46 -07:00
Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/audit
2015-09-08 13:34:59 -07:00
bcache: Add bch_btree_keys_u64s_remaining()
2014-01-08 13:05:13 -08:00
mtd: provide proper 32/64-bit compat_ioctl() support for BLKPG
2015-09-29 13:37:04 -07:00
bpf: support flow label for bpf_skb_{set, get}_tunnel_key
2016-03-11 15:14:27 -05: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: extend balance filter usage to take minimum and maximum
2015-10-26 19:38:30 -07: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
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
Introduce devlink infrastructure
2016-03-01 16:07:29 -05:00
dlm: fix lvb copy for user locks
2015-08-25 14:41:50 -05:00
dlm: adopt orphan locks
2014-11-19 14:48:02 -06:00
dm: add support for passing through persistent reservations
2015-10-31 19:05:59 -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
elf-em.h: move EM_MICROBLAZE to the common header
2015-09-10 06:54:15 +02: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
ethtool.h: define INT_MAX for userland
2016-03-04 16:10:37 -05:00
epoll: add EPOLLEXCLUSIVE flag
2016-01-20 17:09:18 -08: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
bpf: fix bpf helpers to use skb->mac_header relative offsets
2015-04-16 14:08:49 -04:00
fou: implement FOU_CMD_GET
2015-04-12 21:25:13 -04:00
block: revert runtime dax control of the raw block device
2016-01-30 13:35:31 -08:00
fuse: add support for SEEK_HOLE and SEEK_DATA in lseek
2015-11-10 10:32:37 +01:00
openvswitch: allow management from inside user namespaces
2016-02-11 09:53:19 -05:00
gfs2: change gfs2 readdir cookie
2015-12-14 12:19:37 -06:00
tty: linux/gsmmux.h needs linux/types.h
2015-07-23 17:48:43 -07:00
keys, trusted: select hash algorithm for TPM2 chips
2015-12-20 15:27:12 +02:00
net/hsr: Add support for the High-availability Seamless Redundancy protocol (HSRv0)
2013-11-03 23:20:14 -05:00
tools: hv: report ENOSPC errors in hv_fcopy_daemon
2015-12-14 19:12:21 -08:00
i2c-dev: Fix typo in ioctl name reference
2015-10-23 23:26:43 +02: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
arcnet: fix indentation of if_arcnet.h
2015-09-23 08:44:22 +02: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: mcast: add support for more router port information dumping
2016-03-01 16:55:07 -05:00
uapi: add MACsec bits
2016-03-13 22:40:24 -04:00
FDDI: Reformat <linux/if_fddi.h> for 8-character tabs
2014-04-27 19:08:06 -04:00
uapi: add MACsec bits
2016-03-13 22:40:24 -04:00
uapi: add MACsec bits
2016-03-13 22:40:24 -04:00
packet: add extended BPF fanout mode
2015-08-17 14:22:48 -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
ila: Add generic ILA translation facility
2015-12-15 23:25:20 -05:00
api: fix compatibility of linux/in.h with netinet/in.h
2015-06-29 18:56:21 -07:00
ipv6: add IPV6_HDRINCL option for raw sockets
2015-12-17 15:12:28 -05:00
net: inet_diag: export IPV6_V6ONLY sockopt
2015-06-24 02:51:39 -07:00
Input: add input-event-codes header file
2015-10-16 15:32:05 -07:00
Input: evdev - add event-mask API
2015-10-26 19:06:48 -07:00
ipv4: add option to drop gratuitous ARP packets
2016-02-11 04:27:35 -05:00
ipvs: add more mcast parameters for the sync daemon
2015-08-21 09:10:11 -07:00
net: ipv6: Make address flushing on ifdown optional
2016-02-25 21:45:15 -05:00
ipv6: Create percpu rt6_info
2015-05-25 13:25:35 -04:00
uapi: add MACsec bits
2016-03-13 22:40:24 -04:00
kcm: Kernel Connection Multiplexor module
2016-03-09 16:36:14 -05:00
kcmp: Move kcmp.h into uapi
2014-12-02 13:52:53 -07:00
proc: export idle flag via kpageflags
2015-09-10 13:29:01 -07:00
uapi: define DIV_ROUND_UP for userland
2016-03-04 16:10:36 -05: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: s390: implement the RI support of guest
2016-01-07 14:48:26 +01: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
lightnvm: introduce factory reset
2016-01-12 08:21:18 -07:00
[media] bz#75751: Move internal header file lirc.h to uapi/
2015-11-17 06:47:43 -02:00
block: loop: introduce ioctl command of LOOP_SET_DIRECT_IO
2015-09-23 11:01:16 -06:00
lwtunnel: remove source and destination UDP port config option
2015-09-24 14:31:37 -07:00
Merge branch 'overlayfs-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs
2016-01-21 12:20:46 -08: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: Sanitise the reserved fields of the G_TOPOLOGY IOCTL arguments
2016-03-03 18:10:53 -03:00
mei: add async event notification ioctls
2015-08-03 17:30:00 -07:00
sys_membarrier(): system-wide memory barrier (generic, x86)
2015-09-11 15:21:34 -07: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: Update MIC host daemon with COSM changes
2015-10-04 12:54:54 +01: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
net: ipmr: fix code and comment style
2015-11-23 15:06:38 -05:00
uapi: define DIV_ROUND_UP for userland
2016-03-04 16:10:36 -05: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
nfit: update address range scrub commands to the acpi 6.1 format
2016-02-23 17:17:20 -08: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
netconf: add macro to represent all attributes
2016-03-13 21:54:44 -04: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
netfilter: fix include files for compilation
2015-11-23 17:54:38 +01:00
netlink: remove mmapped netlink support
2016-02-18 11:42:18 -05:00
netlink: remove mmapped netlink support
2016-02-18 11:42:18 -05:00
NFC: netlink: Add missing NFC_ATTR comments
2015-10-27 03:55:10 +01:00
nfs: use btrfs ioctl defintions for clone
2015-11-23 21:53:08 -05:00
NFS: Update NFS4_BITMAP_SIZE
2015-08-27 19:44:53 -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
nfsd: Add macro NFS_ACL_MASK for ACL
2015-07-20 14:58:46 -04:00
cfg80211: Add global RRM capability
2016-02-24 09:04:41 +01:00
nvme: move hardware structures out of the uapi version of nvme.h
2015-10-09 10:40:37 -06:00
openvswitch: Interface with NAT.
2016-03-14 23:47:29 +01:00
diag: warn about missing first netlink attribute
2013-11-28 18:16:43 -05:00
PCI: Make Enhanced Allocation bitmasks more obvious
2015-10-29 17:35:40 -05:00
perf/x86: Add option to disable reading branch flags/cycles
2015-11-23 09:58:25 +01:00
ipsec: add support of limited SA dump
2014-02-17 07:18:19 +01:00
net/flower: Introduce hardware offload support
2016-03-10 16:24:02 -05:00
net, sched: add clsact qdisc
2016-01-10 22:13:15 -05:00
include/uapi/linux/ppp-ioctl.h: pull in ppp_defs.h
2014-01-23 16:36:55 -08:00
block: add an API for Persistent Reservations
2015-10-21 14:46:56 -06:00
capabilities: ambient capabilities
2015-09-04 16:54:41 -07:00
drivers: firmware: psci: add system suspend support
2015-10-02 14:35:17 +01:00
ptp: introduce programmable pins.
2014-03-21 14:21:13 -04:00
seccomp, ptrace: add support for dumping seccomp filters
2015-10-27 19:55:13 -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
uapi: Use __kernel_long_t/__kernel_ulong_t in <linux/resource.h>
2014-01-20 14:44:17 -08:00
rfkill: Update userspace API documentation
2016-02-24 09:04:25 +01:00
ipv6: allow routes to be configured with expire values
2015-12-17 15:08:51 -05:00
sched: Update comments about CLONE_NEWUTS and CLONE_NEWIPC
2014-11-16 10:58:53 +01:00
misc: mic: SCIF RMA header file and IOCTL changes
2015-10-04 12:54:54 +01:00
efifb: Add support for 64-bit frame buffer addresses
2015-10-12 14:20:06 +01: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
capabilities: add a securebit to disable PR_CAP_AMBIENT_RAISE
2015-09-04 16:54:41 -07:00
ipc/sem.c: increase SEMMSL, SEMMNI, SEMOPM
2014-12-13 12:42:52 -08:00
serial: support 16-bit register interface for console
2015-12-13 19:59:48 -08:00
serial: remove NWP serial support
2015-12-13 19:59:48 -08:00
ARM: OMAP1: Move UART defines to prepare for sparse IRQ
2015-05-20 09:01:20 -07:00
Input: add eGalaxTouch serial touchscreen driver
2015-12-16 11:31:33 -08: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
net: diag: Add the ability to destroy a socket.
2015-12-15 23:26:51 -05:00
include/uapi/linux/sockios.h: mark SIOCRTMSG unused
2016-01-05 16:44:06 -05:00
stm class: Introduce an abstraction for System Trace Module devices
2015-10-04 20:28:58 +01:00
kernel: add panic_on_warn
2014-12-10 17:41:10 -08:00
target: use stringify.h instead of own definition
2015-09-11 00:32:36 -07:00
tcp: Add RFC4898 tcpEStatsPerfDataSegsOut/In
2016-03-14 14:55:26 -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
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
toshiba_acpi: Add /dev/toshiba_acpi device
2015-07-24 14:15:10 -07: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 - rework ABS validation
2015-12-18 17:48:51 -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
userfaultfd: remove kernel header include from uapi header
2015-10-01 21:42:35 -04:00
Input: add userio module
2015-10-27 18:55:31 -07:00
[media] v4l: Add V4L2_SEL_TGT_NATIVE_SIZE selection target
2014-12-04 12:37:01 -02:00
[media] include/media: move driver interface headers to a separate dir
2015-11-17 06:57:29 -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: Include No-IOMMU mode
2015-12-21 15:28:11 -07:00
vhost: cross-endian support for legacy devices
2015-06-01 15:48:55 +02:00
Revert "[media] UVC: Add support for ds4 depth camera"
2015-12-12 08:10:40 -02: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
include/uapi/linux/virtio_gpu.h: use __u8 from <linux/types.h>
2015-12-10 12:33:23 +01:00
Revert "Merge branch 'vsock-virtio'"
2015-12-08 21:55:49 -05: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
[media] media: uapi: vsp1: Use __u32 instead of u32
2015-07-06 08:25:50 -03: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
1cdba55055