David S. Miller 59ce9670ce 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 the first batch of Netfilter updates for the upcoming 4.5 kernel. This batch contains userspace netfilter header compilation fixes, support for packet mangling in nf_tables, the new tracing infrastructure for nf_tables and cgroup2 support for iptables. More specifically, they are: 1) Two patches to include dependencies in our netfilter userspace headers to resolve compilation problems, from Mikko Rapeli. 2) Four comestic cleanup patches for the ebtables codebase, from Ian Morris. 3) Remove duplicate include in the netfilter reject infrastructure, from Stephen Hemminger. 4) Two patches to simplify the netfilter defragmentation code for IPv6, patch from Florian Westphal. 5) Fix root ownership of /proc/net netfilter for unpriviledged net namespaces, from Philip Whineray. 6) Get rid of unused fields in struct nft_pktinfo, from Florian Westphal. 7) Add mangling support to our nf_tables payload expression, from Patrick McHardy. 8) Introduce a new netlink-based tracing infrastructure for nf_tables, from Florian Westphal. 9) Change setter functions in nfnetlink_log to be void, from Rami Rosen. 10) Add netns support to the cttimeout infrastructure. 11) Add cgroup2 support to iptables, from Tejun Heo. 12) Introduce nfnl_dereference_protected() in nfnetlink, from Florian. 13) Add support for mangling pkttype in the nf_tables meta expression, also from Florian. BTW, I need that you pull net into net-next, I have another batch that requires changes that I don't yet see in net. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>		2015-12-18 15:37:42 -05:00
..
android
byteorder
caif
can	can: avoid using timeval for uapi	2015-10-13 17:42:34 +02:00
cifs
dvb
genwqe
hdlc
hsi
iio
isdn
mmc	mmc: block: Add new ioctl to send multi commands	2015-10-26 16:00:00 +01:00
netfilter	netfilter: implement xt_cgroup cgroup2 path match	2015-12-14 20:34:55 +01:00
netfilter_arp	netfilter: fix include files for compilation	2015-11-23 17:54:38 +01:00
netfilter_bridge	netfilter: fix include files for compilation	2015-11-23 17:54:38 +01:00
netfilter_ipv4	netfilter: fix include files for compilation	2015-11-23 17:54:38 +01:00
netfilter_ipv6	netfilter: fix include files for compilation	2015-11-23 17:54:38 +01:00
nfsd
raid	raid5: enable log for raid array with cache disk	2015-11-01 13:48:26 +11:00
spi
sunrpc
tc_act
tc_ematch
usb	USB patches for 4.4-rc1	2015-11-04 21:26:27 -08:00
wimax
a.out.h
acct.h
adb.h
adfs_fs.h
affs_hardblocks.h
agpgart.h
aio_abi.h
am437x-vpfe.h
apm_bios.h
arcfb.h
atalk.h
atm.h
atm_eni.h
atm_he.h
atm_idt77105.h
atm_nicstar.h
atm_tcp.h
atm_zatm.h	atm: remove 'struct zatm_t_hist'	2015-10-05 03:16:46 -07:00
atmapi.h
atmarp.h
atmbr2684.h
atmclip.h
atmdev.h
atmioc.h
atmlec.h
atmmpc.h
atmppp.h
atmsap.h
atmsvc.h
audit.h
auto_fs.h
auto_fs4.h
auxvec.h
ax25.h
b1lli.h
baycom.h
bcache.h
bcm933xx_hcs.h
bfs_fs.h
binfmts.h
blkpg.h
blktrace_api.h
bpf.h	bpf: add support for persistent maps/progs	2015-11-02 22:48:39 -05:00
bpf_common.h
bpqether.h
bsg.h
btrfs.h	btrfs: extend balance filter usage to take minimum and maximum	2015-10-26 19:38:30 -07:00
can.h
capability.h
capi.h
cciss_defs.h
cciss_ioctl.h
cdrom.h
cgroupstats.h
chio.h
cm4000_cs.h
cn_proc.h
coda.h
coda_psdev.h
coff.h
connector.h
const.h
cramfs_fs.h
cryptouser.h
cuda.h
cyclades.h
cycx_cfm.h
dcbnl.h
dccp.h
dlm.h
dlm_device.h
dlm_netlink.h
dlm_plock.h
dlmconstants.h
dm-ioctl.h	dm: add support for passing through persistent reservations	2015-10-31 19:05:59 -04:00
dm-log-userspace.h
dn.h
dqblk_xfs.h
edd.h
efs_fs_sb.h
elf-em.h
elf-fdpic.h
elf.h
elfcore.h
errno.h
errqueue.h
ethtool.h
eventpoll.h
fadvise.h
falloc.h
fanotify.h
fb.h
fcntl.h
fd.h
fdreg.h
fib_rules.h
fiemap.h
filter.h
firewire-cdev.h
firewire-constants.h
flat.h
fou.h
fs.h	ext4: reserve code points for the project quota feature	2015-10-17 16:15:18 -04:00
fsl_hypervisor.h
fuse.h
futex.h
gameport.h
gen_stats.h
genetlink.h
gfs2_ondisk.h
gigaset_dev.h
gsmmux.h
hash_info.h
hdlc.h
hdlcdrv.h
hdreg.h
hid.h
hiddev.h
hidraw.h
hpet.h
hsr_netlink.h
hw_breakpoint.h
hyperv.h
hysdn_if.h
i2c-dev.h	i2c-dev: Fix typo in ioctl name reference	2015-10-23 23:26:43 +02:00
i2c.h
i2o-dev.h
i8k.h
icmp.h
icmpv6.h
if.h
if_addr.h
if_addrlabel.h
if_alg.h
if_arcnet.h
if_arp.h
if_bonding.h
if_bridge.h
if_cablemodem.h
if_eql.h
if_ether.h
if_fc.h
if_fddi.h
if_frad.h
if_hippi.h
if_infiniband.h
if_link.h	ipv6: addrconf: use stable address generator for ARPHRD_NONE	2015-12-18 14:41:07 -05:00
if_ltalk.h
if_packet.h
if_phonet.h
if_plip.h
if_ppp.h
if_pppol2tp.h
if_pppox.h
if_slip.h
if_team.h
if_tun.h
if_tunnel.h
if_vlan.h
if_x25.h
igmp.h
ila.h	ila: Add generic ILA translation facility	2015-12-15 23:25:20 -05:00
in.h
in6.h	ipv6: add IPV6_HDRINCL option for raw sockets	2015-12-17 15:12:28 -05:00
in_route.h
inet_diag.h
inotify.h
input-event-codes.h	Input: add input-event-codes header file	2015-10-16 15:32:05 -07:00
input.h	Input: evdev - add event-mask API	2015-10-26 19:06:48 -07:00
ioctl.h
ip.h
ip6_tunnel.h
ip_vs.h
ipc.h
ipmi.h
ipmi_msgdefs.h
ipsec.h
ipv6.h
ipv6_route.h
ipx.h
irda.h
irqnr.h
isdn.h
isdn_divertif.h
isdn_ppp.h
isdnif.h
iso_fs.h
ivtv.h
ivtvfb.h
ixjuser.h
jffs2.h
joystick.h
Kbuild	uapi: export ila.h	2015-12-11 23:39:33 -05:00
kcmp.h
kd.h
kdev_t.h
kernel-page-flags.h
kernel.h
kernelcapi.h
kexec.h
keyboard.h
keyctl.h
kfd_ioctl.h
kvm.h
kvm_para.h
l2tp.h
libc-compat.h
lightnvm.h	lightnvm: Support for Open-Channel SSDs	2015-10-29 16:21:42 +09:00
limits.h
llc.h
loop.h
lp.h
lwtunnel.h
magic.h	bpf: add support for persistent maps/progs	2015-11-02 22:48:39 -05:00
major.h
map_to_7segment.h
matroxfb.h
mdio.h
media-bus-format.h
media.h
mei.h
membarrier.h
memfd.h
mempolicy.h
meye.h
mic_common.h
mic_ioctl.h
mii.h
minix_fs.h
mman.h
mmtimer.h
module.h
mpls.h
mpls_iptunnel.h
mqueue.h
mroute.h	net: ipmr: fix code and comment style	2015-11-23 15:06:38 -05:00
mroute6.h
msdos_fs.h
msg.h
mtio.h
n_r3964.h
nbd.h
ncp.h
ncp_fs.h
ncp_mount.h
ncp_no.h
ndctl.h
neighbour.h
net.h
net_dropmon.h
net_namespace.h
net_tstamp.h
netconf.h
netdevice.h
netfilter.h
netfilter_arp.h
netfilter_bridge.h	netfilter: fix include files for compilation	2015-11-23 17:54:38 +01:00
netfilter_decnet.h
netfilter_ipv4.h
netfilter_ipv6.h
netlink.h
netlink_diag.h
netrom.h
nfc.h	NFC: netlink: Add missing NFC_ATTR comments	2015-10-27 03:55:10 +01:00
nfs.h	nfs: use btrfs ioctl defintions for clone	2015-11-23 21:53:08 -05:00
nfs2.h
nfs3.h
nfs4.h
nfs4_mount.h
nfs_fs.h
nfs_idmap.h
nfs_mount.h
nfsacl.h
nl80211.h	cfg80211: Add support for aborting an ongoing scan	2015-12-04 14:43:32 +01:00
nubus.h
nvme_ioctl.h	nvme: move hardware structures out of the uapi version of nvme.h	2015-10-09 10:40:37 -06:00
nvram.h
omap3isp.h
omapfb.h
oom.h
openvswitch.h	openvswitch: fix trivial comment typo	2015-12-14 14:00:09 -05:00
packet_diag.h
param.h
parport.h
patchkey.h
pci.h
pci_regs.h	PCI: Make Enhanced Allocation bitmasks more obvious	2015-10-29 17:35:40 -05:00
perf_event.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2015-11-04 09:41:05 -08:00
personality.h
pfkeyv2.h
pg.h
phantom.h
phonet.h
pkt_cls.h
pkt_sched.h
pktcdvd.h
pmu.h
poll.h
posix_types.h
ppdev.h
ppp-comp.h
ppp-ioctl.h
ppp_defs.h
pps.h
pr.h	block: add an API for Persistent Reservations	2015-10-21 14:46:56 -06:00
prctl.h
psci.h
ptp_clock.h
ptrace.h	seccomp, ptrace: add support for dumping seccomp filters	2015-10-27 19:55:13 -07:00
qnx4_fs.h
qnxtypes.h
quota.h
radeonfb.h
random.h
raw.h
rds.h
reboot.h
reiserfs_fs.h
reiserfs_xattr.h
resource.h
rfkill.h
romfs_fs.h
rose.h
route.h
rtc.h
rtnetlink.h	ipv6: allow routes to be configured with expire values	2015-12-17 15:08:51 -05:00
scc.h
sched.h
scif_ioctl.h
screen_info.h	efifb: Add support for 64-bit frame buffer addresses	2015-10-12 14:20:06 +01:00
sctp.h
sdla.h
seccomp.h
securebits.h
selinux_netlink.h
sem.h
serial.h
serial_core.h
serial_reg.h
serio.h
shm.h
signal.h
signalfd.h
smiapp.h
snmp.h
sock_diag.h	net: diag: Add the ability to destroy a socket.	2015-12-15 23:26:51 -05:00
socket.h
sockios.h
sonet.h
sonypi.h
sound.h
soundcard.h
stat.h
stddef.h
stm.h
string.h
suspend_ioctls.h
swab.h
synclink.h
sysctl.h
sysinfo.h
target_core_user.h
taskstats.h
tcp.h
tcp_metrics.h
telephony.h
termios.h
thermal.h
time.h
times.h
timex.h
tiocl.h
tipc.h
tipc_config.h
tipc_netlink.h
toshiba.h
tty.h
tty_flags.h
types.h
udf_fs_i.h
udp.h
uhid.h
uinput.h
uio.h
ultrasound.h
un.h
unistd.h
unix_diag.h
usbdevice_fs.h
usbip.h
userfaultfd.h
userio.h	Input: add userio module	2015-10-27 18:55:31 -07:00
utime.h
utsname.h
uuid.h
uvcvideo.h
v4l2-common.h
v4l2-controls.h	[media] v4l2: add RF gain control	2015-10-20 15:37:56 -02:00
v4l2-dv-timings.h
v4l2-mediabus.h
v4l2-subdev.h
veth.h
vfio.h	Revert: "vfio: Include No-IOMMU mode"	2015-12-04 08:38:42 -07:00
vhost.h
videodev2.h	[media] v4l: add type field to v4l2_modulator struct	2015-10-20 15:42:47 -02:00
virtio_9p.h
virtio_balloon.h
virtio_blk.h
virtio_config.h
virtio_console.h
virtio_gpu.h	virtio-gpu: add 3d/virgl support	2015-10-16 10:44:02 +02:00
virtio_ids.h	Revert "Merge branch 'vsock-virtio'"	2015-12-08 21:55:49 -05:00
virtio_input.h
virtio_net.h
virtio_pci.h
virtio_ring.h
virtio_rng.h
virtio_scsi.h
virtio_types.h
vm_sockets.h
vsp1.h
vt.h
wait.h
wanrouter.h
watchdog.h
wil6210_uapi.h
wimax.h
wireless.h
x25.h
xattr.h
xfrm.h
xilinx-v4l2-controls.h
zorro.h
zorro_ids.h