David S. Miller 2745529ac7 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Couple conflicts resolved here: 1) In the MACB driver, a bug fix to properly initialize the RX tail pointer properly overlapped with some changes to support variable sized rings. 2) In XGBE we had a "CONFIG_PM" --> "CONFIG_PM_SLEEP" fix overlapping with a reorganization of the driver to support ACPI, OF, as well as PCI variants of the chip. 3) In 'net' we had several probe error path bug fixes to the stmmac driver, meanwhile a lot of this code was cleaned up and reorganized in 'net-next'. 4) The cls_flower classifier obtained a helper function in 'net-next' called __fl_delete() and this overlapped with Daniel Borkamann's bug fix to use RCU for object destruction in 'net'. It also overlapped with Jiri's change to guard the rhashtable_remove_fast() call with a check against tc_skip_sw(). 5) In mlx4, a revert bug fix in 'net' overlapped with some unrelated changes in 'net-next'. 6) In geneve, a stale header pointer after pskb_expand_head() bug fix in 'net' overlapped with a large reorganization of the same code in 'net-next'. Since the 'net-next' code no longer had the bug in question, there was nothing to do other than to simply take the 'net-next' hunks. Signed-off-by: David S. Miller <davem@davemloft.net>		2016-12-03 12:29:53 -05:00
..
android
byteorder	include/uapi/linux/byteorder, swab: force inlining of some byteswap operations	2016-03-17 15:09:34 -07:00
caif
can	can: bcm: add support for CAN FD frames	2016-06-17 15:39:46 +02:00
cifs
dvb	[media] fix broken references on dvb/video*rst	2016-09-09 09:53:35 -03:00
genwqe
hdlc
hsi	HSI: hsi_char.h: use __u32 from linux/types.h	2016-08-22 22:43:35 +02:00
iio	iio: electricalconductivity: add IIO_ELECTRICALCONDUCTIVITY type	2016-05-29 20:03:21 +01:00
isdn
mmc
netfilter	netfilter: nf_tables: introduce routing expression	2016-11-01 20:50:31 +01:00
netfilter_arp
netfilter_bridge
netfilter_ipv4
netfilter_ipv6
nfsd
raid
spi
sunrpc
tc_act	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-12-03 12:29:53 -05:00
tc_ematch
usb	usb: gadget: f_fs: handle control requests in config 0	2016-08-25 12:13:17 +03: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	Revert "include/uapi/linux/atm_zatm.h: include linux/time.h"	2016-11-13 12:35:13 -05: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	Merge branch 'stable-4.9' of git://git.infradead.org/users/pcmoore/audit	2016-10-04 14:21:41 -07:00
auto_dev-ioctl.h	autofs4: move linux/auto_dev-ioctl.h to uapi/linux	2016-10-11 15:06:31 -07:00
auto_fs.h	autofs: move inclusion of linux/limits.h to uapi	2016-10-11 15:06:31 -07:00
auto_fs4.h	autofs4: fix some white space errors	2016-03-15 16:55:16 -07:00
auxvec.h
ax25.h
b1lli.h
batman_adv.h	batman-adv: add backbone table netlink support	2016-08-09 07:54:43 +02:00
baycom.h
bcache.h
bcm933xx_hcs.h
bfs_fs.h
binfmts.h
blkpg.h
blktrace_api.h
bpf.h	bpf: Add support for reading socket family, type, protocol	2016-12-02 13:46:09 -05:00
bpf_common.h
bpf_perf_event.h	bpf: introduce BPF_PROG_TYPE_PERF_EVENT program type	2016-09-02 10:46:44 -07:00
bpqether.h	net: bpqether.h: remove if_ether.h guard	2016-11-13 00:57:53 -05:00
bsg.h
bt-bmc.h	ipmi: add an Aspeed BT IPMI BMC driver	2016-09-29 19:05:06 -05:00
btrfs.h	Btrfs: catch invalid free space trees	2016-10-03 18:52:14 +02:00
btrfs_tree.h	btrfs: uapi/linux/btrfs_tree.h, use __u8 and __u64	2016-04-28 11:06:41 +02:00
can.h
capability.h	uapi: move forward declarations of internal structures	2016-08-02 17:31:41 -04:00
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
coresight-stm.h	coresight: stm: adding driver for CoreSight STM component	2016-05-03 14:59:30 -07:00
cramfs_fs.h
cryptouser.h	crypto: kpp - Key-agreement Protocol Primitives API (KPP)	2016-06-23 18:29:56 +08:00
cuda.h
cyclades.h
cycx_cfm.h
dcbnl.h
dccp.h
devlink.h	devlink: Add E-Switch inline mode control	2016-11-24 16:01:14 -05:00
dlm.h
dlm_device.h
dlm_netlink.h
dlm_plock.h
dlmconstants.h
dm-ioctl.h	dm: add infrastructure for DAX support	2016-07-20 23:49:49 -04:00
dm-log-userspace.h
dma-buf.h
dn.h
dqblk_xfs.h
edd.h
efs_fs_sb.h
elf-em.h	bpf, elf: add official ELF machine define for eBPF	2016-07-20 12:37:39 -07:00
elf-fdpic.h
elf.h	powerpc updates for 4.8 #2	2016-08-05 09:00:54 -04:00
elfcore.h
errno.h
errqueue.h
ethtool.h	ethtool: (uapi) Add ETHTOOL_PHY_DOWNSHIFT to PHY tunables	2016-11-18 12:12:14 -05:00
eventpoll.h
fadvise.h
falloc.h	vfs: add a FALLOC_FL_UNSHARE mode to fallocate to unshare a range of blocks	2016-10-03 09:11:14 -07:00
fanotify.h
fb.h
fcntl.h
fd.h
fdreg.h
fib_rules.h	net: core: add UID to flows, rules, and routes	2016-11-04 14:45:23 -04:00
fiemap.h
filter.h
firewire-cdev.h
firewire-constants.h
flat.h
fou.h
fs.h	xfs: reflink update for 4.9-rc1	2016-10-13 20:28:22 -07:00
fsl_hypervisor.h
fuse.h	fuse: Add posix ACL support	2016-10-01 07:32:32 +02:00
futex.h
gameport.h
gen_stats.h	sched: align nlattr properly when needed	2016-04-26 12:00:49 -04:00
genetlink.h	genetlink: use idr to track families	2016-10-27 16:16:09 -04:00
gfs2_ondisk.h
gigaset_dev.h
gpio.h	gpio: userspace ABI for reading GPIO line events	2016-06-15 09:29:17 +02:00
gsmmux.h
gtp.h	gtp: #define _UAPI_LINUX_GTP_H_ and not _UAPI_LINUX_GTP_H__	2016-06-07 16:25:49 -07:00
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.h	i2c: smbus: add SMBus Host Notify support	2016-06-17 13:24:05 +02:00
i2o-dev.h
i8k.h
icmp.h	ipv6: RFC 4884 partial support for SIT/GRE tunnels	2016-06-18 22:11:39 -07:00
icmpv6.h
if.h	uapi glibc compat: fix compile errors when glibc net/if.h included before linux/if.h	2016-05-09 21:29:31 -04:00
if_addr.h
if_addrlabel.h
if_alg.h
if_arcnet.h
if_arp.h
if_bonding.h
if_bridge.h	net: bridge: export vlan flags with the stats	2016-08-18 23:18:42 -07:00
if_cablemodem.h
if_eql.h
if_ether.h	ethernet: use net core MTU range checking in more drivers	2016-10-20 14:51:08 -04:00
if_fc.h
if_fddi.h
if_frad.h
if_hippi.h
if_infiniband.h
if_link.h	bpf, xdp: allow to pass flags to dev_change_xdp_fd	2016-11-30 10:27:20 -05:00
if_ltalk.h
if_macsec.h	macsec: limit ICV length to 16 octets	2016-07-25 10:55:39 -07:00
if_packet.h
if_phonet.h
if_plip.h
if_ppp.h
if_pppol2tp.h	include/uapi/linux/if_pppol2tp.h: include linux/in.h and linux/in6.h	2016-08-22 16:25:14 -07:00
if_pppox.h	include/uapi/linux/if_pppox.h: include linux/in.h and linux/in6.h	2016-08-22 16:25:15 -07:00
if_slip.h
if_team.h
if_tun.h
if_tunnel.h	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2016-09-25 23:34:19 +02:00
if_vlan.h
if_x25.h
igmp.h
ila.h	ila: add checksum neutral ILA translations	2016-04-26 01:27:07 -04:00
in.h	ipv4: add IP_RECVFRAGSIZE cmsg	2016-11-03 15:41:11 -04:00
in6.h	ipv6: add IPV6_RECVFRAGSIZE cmsg	2016-11-03 15:41:11 -04:00
in_route.h
inet_diag.h	net: ip, diag -- Add diag interface for raw sockets	2016-10-23 19:35:24 -04:00
inotify.h
input-event-codes.h	Input: change KEY_DATA from 0x275 to 0x277	2016-11-30 08:59:26 -08:00
input.h	HID: intel-ish-hid: ISH HID client driver	2016-08-17 11:13:08 +02:00
ioctl.h
ip.h
ip6_tunnel.h
ip_vs.h	netfilter/ipvs: use nla_put_u64_64bit()	2016-04-25 15:09:11 -04:00
ipc.h
ipmi.h
ipmi_msgdefs.h
ipsec.h
ipv6.h	ipv6: sr: add core files for SR HMAC support	2016-11-09 20:40:06 -05:00
ipv6_route.h
ipx.h	include/uapi/linux/ipx.h: fix conflicting defitions with glibc netipx/ipx.h	2016-08-22 16:25:15 -07:00
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	A small bug fix and a new driver for acting as an IPMI device.	2016-10-23 15:56:23 -07:00
kcm.h
kcmp.h
kcov.h	kernel: add kcov code coverage	2016-03-22 15:36:02 -07:00
kd.h
kdev_t.h
kernel-page-flags.h
kernel.h
kernelcapi.h
kexec.h	arm64/kexec: Add core kexec support	2016-06-27 16:31:25 +01:00
keyboard.h
keyctl.h	KEYS: Add KEYCTL_DH_COMPUTE command	2016-04-12 19:54:58 +01:00
kfd_ioctl.h
kvm.h	kvm: kvmclock: let KVM_GET_CLOCK return whether the master clock is in use	2016-11-19 19:04:16 +01:00
kvm_para.h
l2tp.h	net: l2tp: change L2TP_ATTR_UDP_ZERO_CSUM6_{RX, TX} attribute types	2016-11-09 18:55:36 -05:00
libc-compat.h	include/uapi/linux/ipx.h: fix conflicting defitions with glibc netipx/ipx.h	2016-08-22 16:25:15 -07:00
lightnvm.h
limits.h
lirc.h	[media] lirc.h: remove several unused ioctls	2016-07-11 10:49:52 -03:00
llc.h
loop.h
lp.h
lwtunnel.h	bpf: BPF for lightweight tunnel infrastructure	2016-12-02 10:51:49 -05:00
magic.h	dax: define a unified inode/address_space for device-dax mappings	2016-08-23 22:58:51 -07:00
major.h
map_to_7segment.h
matroxfb.h
mdio.h
media-bus-format.h	[media] media: Add 1X16 16-bit raw bayer media bus code definitions	2016-09-09 11:16:36 -03:00
media.h	[media] v4l2-core: Add support for touch devices	2016-08-23 16:28:04 -03:00
mei.h
membarrier.h
memfd.h
mempolicy.h
meye.h
mic_common.h
mic_ioctl.h
mii.h	net: Add mask for Control register 10Mbps speed	2016-08-12 16:57:20 -07:00
minix_fs.h
mman.h
mmtimer.h
module.h
mpls.h
mpls_iptunnel.h
mqueue.h
mroute.h
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	libnvdimm: fix SMART Health DSM payload definition	2016-08-15 11:07:21 -07:00
neighbour.h	libnl: nla_put_msecs(): align on a 64-bit area	2016-04-23 20:13:24 -04:00
net.h
net_dropmon.h
net_namespace.h
net_tstamp.h	tcp: SOF_TIMESTAMPING_OPT_STATS option for SO_TIMESTAMPING	2016-11-30 10:04:25 -05:00
netconf.h
netdevice.h
netfilter.h	netfilter: deprecate NF_STOP	2016-11-03 10:56:17 +01:00
netfilter_arp.h
netfilter_bridge.h
netfilter_decnet.h
netfilter_ipv4.h
netfilter_ipv6.h
netlink.h
netlink_diag.h	netlink: Add comment to warn about deprecated netlink rings attribute request	2016-06-16 14:00:50 -07:00
netrom.h
nfc.h
nfs.h
nfs2.h
nfs3.h
nfs4.h	nfs: add a new NFS4_OPEN_RESULT_MAY_NOTIFY_LOCK constant	2016-09-26 15:20:37 -04:00
nfs4_mount.h
nfs_fs.h
nfs_idmap.h
nfs_mount.h
nfsacl.h
nilfs2_api.h	nilfs2: move ioctl interface and disk layout to uapi separately	2016-08-02 19:35:21 -04:00
nilfs2_ondisk.h	nilfs2: move ioctl interface and disk layout to uapi separately	2016-08-02 19:35:21 -04:00
nl80211.h	cfg80211: Add support to update connection parameters	2016-10-27 16:03:28 +02:00
nsfs.h	nsfs: add ioctl to get a parent namespace	2016-09-22 19:59:41 -05:00
nubus.h
nvme_ioctl.h	NVMe: Allow user initiated rescan	2016-05-17 17:14:21 -06:00
nvram.h
omap3isp.h
omapfb.h
oom.h
openvswitch.h	openvswitch: add Ethernet push and pop actions	2016-11-13 00:51:02 -05:00
packet_diag.h
param.h
parport.h
patchkey.h
pci.h
pci_regs.h	qedr: Add RoCE driver framework	2016-10-14 15:00:10 -04:00
perf_event.h	perf core: Per event callchain limit	2016-05-30 12:41:44 -03:00
personality.h
pfkeyv2.h
pg.h
phantom.h
phonet.h
pkt_cls.h	net/sched: cls_flower: Add UDP port to tunnel parameters	2016-11-09 13:41:54 -05:00
pkt_sched.h	net_sched: sch_fq: account for schedule/timers drifts	2016-09-23 07:19:06 -04:00
pktcdvd.h
pmu.h
poll.h
posix_acl.h	posix_acl: uapi header split	2016-09-27 21:52:00 -04:00
posix_acl_xattr.h	posix_acl: uapi header split	2016-09-27 21:52:00 -04:00
posix_types.h
ppdev.h
ppp-comp.h
ppp-ioctl.h
ppp_defs.h
pps.h
pr.h
prctl.h
psci.h
ptp_clock.h
ptrace.h
qnx4_fs.h
qnxtypes.h
qrtr.h	net: Add Qualcomm IPC router	2016-05-08 23:46:14 -04:00
quota.h	fs/quota: use nla_put_u64_64bit()	2016-04-26 12:00:48 -04:00
radeonfb.h
random.h
raw.h
rds.h
reboot.h
reiserfs_fs.h
reiserfs_xattr.h
resource.h
rfkill.h
rio_cm_cdev.h	rapidio: add RapidIO channelized messaging driver	2016-08-02 19:35:31 -04:00
rio_mport_cdev.h	rapidio/mport_cdev: fix uapi type definitions	2016-05-05 17:38:53 -07:00
romfs_fs.h
rose.h
route.h
rtc.h
rtnetlink.h	net: core: add UID to flows, rules, and routes	2016-11-04 14:45:23 -04:00
scc.h
sched.h
scif_ioctl.h
screen_info.h
sctp.h	sctp: Export struct sctp_info to userspace	2016-08-08 12:51:58 -07:00
sdla.h
seccomp.h
securebits.h
seg6.h	ipv6: implement dataplane support for rthdr type 4 (Segment Routing Header)	2016-11-09 20:40:06 -05:00
seg6_genl.h	ipv6: sr: add code base for control plane support of SR-IPv6	2016-11-09 20:40:06 -05:00
seg6_hmac.h	ipv6: sr: add core files for SR HMAC support	2016-11-09 20:40:06 -05:00
seg6_iptunnel.h	ipv6: sr: add support for SRH encapsulation and injection with lwtunnels	2016-11-09 20:40:06 -05:00
selinux_netlink.h
sem.h
serial.h
serial_core.h	TTY and Serial driver update for 4.7-rc1	2016-05-20 20:57:27 -07:00
serial_reg.h	serial: 8250: Set Altera 16550 TX FIFO Threshold	2016-09-27 12:55:50 +02:00
serio.h	[media] input: serio - add new protocol for the Pulse-Eight USB-CEC Adapter	2016-07-12 13:42:10 -03:00
shm.h
signal.h	signals/sigaltstack: Change SS_AUTODISARM to (1U << 31)	2016-05-04 08:34:14 +02:00
signalfd.h
smiapp.h
snmp.h	tcp: md5: add LINUX_MIB_TCPMD5FAILURE counter	2016-08-25 16:43:11 -07:00
sock_diag.h	sock_diag: add SK_MEMINFO_DROPS	2016-04-04 22:11:20 -04:00
socket.h
sockios.h	driver: tun: Use new macro SOCK_IOC_TYPE instead of literal number 0x89	2016-10-31 10:56:47 -04:00
sonet.h
sonypi.h
sound.h
soundcard.h
stat.h
stddef.h	uapi/linux/stddef.h: Provide __always_inline to userspace headers	2016-03-30 12:50:17 +02:00
stm.h
string.h
suspend_ioctls.h
swab.h	byteswap: try to avoid __builtin_constant_p gcc bug	2016-05-05 17:38:53 -07:00
sync_file.h	dma-buf/sync_file: fix documentation error	2016-09-20 18:12:38 +05:30
synclink.h
sysctl.h	uapi: move forward declarations of internal structures	2016-08-02 17:31:41 -04:00
sysinfo.h
target_core_user.h
taskstats.h
tcp.h	tcp: SOF_TIMESTAMPING_OPT_STATS option for SO_TIMESTAMPING	2016-11-30 10:04:25 -05:00
tcp_metrics.h	libnl: nla_put_msecs(): align on a 64-bit area	2016-04-23 20:13:24 -04:00
telephony.h
termios.h
thermal.h
time.h
times.h
timex.h
tiocl.h
tipc.h	tipc: introduce constants for tipc address validation	2016-07-26 14:26:42 -07:00
tipc_config.h
tipc_netlink.h	tipc: add the ability to get UDP options via netlink	2016-08-26 21:38:41 -07:00
toshiba.h
tty.h
tty_flags.h	tty: core: Undefine ASYNC_* flags superceded by TTY_PORT* flags	2016-04-30 09:26:55 -07:00
types.h
udf_fs_i.h
udp.h	gtp: add initial driver for datapath of GPRS Tunneling Protocol (GTP-U)	2016-05-10 12:25:04 -04:00
uhid.h
uinput.h
uio.h
ultrasound.h
un.h
unistd.h
unix_diag.h
usbdevice_fs.h
usbip.h
userfaultfd.h
userio.h
utime.h
utsname.h
uuid.h	lib/uuid.c: remove FSF address	2016-05-20 17:58:30 -07:00
uvcvideo.h
v4l2-common.h
v4l2-controls.h
v4l2-dv-timings.h	[media] SDI: add flag for SDI formats and SMPTE 125M definition	2016-09-19 14:34:41 -03:00
v4l2-mediabus.h
v4l2-subdev.h
veth.h
vfio.h
vhost.h	vhost: new device IOTLB API	2016-08-02 16:53:54 +03:00
videodev2.h	[media] SDI: add flag for SDI formats and SMPTE 125M definition	2016-09-19 14:34:41 -03:00
virtio_9p.h
virtio_balloon.h	virtio_balloon: export 'available' memory to balloon statistics	2016-03-17 15:09:34 -07:00
virtio_blk.h
virtio_config.h	virtio: new feature to detect IOMMU device quirk	2016-08-01 21:44:52 +03:00
virtio_console.h
virtio_gpu.h
virtio_ids.h	VSOCK: Introduce virtio_vsock_common.ko	2016-08-02 02:57:29 +03:00
virtio_input.h
virtio_net.h	virtio_net: add _UAPI prefix to virtio_net header guards	2016-06-10 23:03:55 -07:00
virtio_pci.h
virtio_ring.h
virtio_rng.h
virtio_scsi.h
virtio_types.h
virtio_vsock.h	virtio-vsock: fix include guard typo	2016-08-09 13:42:38 +03:00
vm_sockets.h
vt.h	tty: vt, remove reduntant check	2016-04-30 09:26:55 -07:00
vtpm_proxy.h	tpm: Proxy driver for supporting multiple emulated TPMs	2016-06-25 17:26:35 +03:00
wait.h
wanrouter.h
watchdog.h
wil6210_uapi.h
wimax.h
wireless.h	wext: reformat struct/union declarations	2016-06-09 10:14:39 +02:00
x25.h
xattr.h
xfrm.h	xfrm: fix header file comment reference to struct xfrm_replay_state_esn	2016-09-09 09:10:07 +02:00
xilinx-v4l2-controls.h
zorro.h
zorro_ids.h