Jason Gunthorpe e7996a9a77 Linux 4.15 ... -----BEGIN PGP SIGNATURE----- iQEcBAABAgAGBQJabj6pAAoJEHm+PkMAQRiGs8cIAJQFkCWnbz86e3vG4DuWhyA8 CMGHCQdUOxxFGa/ixhIiuetbC0x+JVHAjV2FwVYbAQfaZB3pfw2iR1ncQxpAP1AI oLU9vBEqTmwKMPc9CM5rRfnLFWpGcGwUNzgPdxD5yYqGDtcM8K840mF6NdkYe5AN xU8rv1wlcFPF4A5pvHCH0pvVmK4VxlVFk/2H67TFdxBs4PyJOnSBnf+bcGWgsKO6 hC8XIVtcKCH2GfFxt5d0Vgc5QXJEpX1zn2mtCa1MwYRjN2plgYfD84ha0xE7J0B0 oqV/wnjKXDsmrgVpncr3txd4+zKJFNkdNRE4eLAIupHo2XHTG4HvDJ5dBY2NhGU= =sOml -----END PGP SIGNATURE----- Merge tag v4.15 of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git To resolve conflicts in: drivers/infiniband/hw/mlx5/main.c drivers/infiniband/hw/mlx5/qp.c From patches merged into the -rc cycle. The conflict resolution matches what linux-next has been carrying. Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>		2018-01-30 09:30:00 -07:00
..
appletalk
arcnet
bonding	bonding: use nla_get_u64 to extract the value for IFLA_BOND_AD_ACTOR_SYSTEM	2017-11-28 15:56:40 -05:00
caif	treewide: setup_timer() -> timer_setup()	2017-11-21 15:57:07 -08:00
can	can: peak: fix potential bug in packet fragmentation	2018-01-16 15:33:15 +01:00
cris	drivers/net: cris: Convert timers to use timer_setup()	2017-11-21 15:46:44 -08:00
dsa	net: dsa: b53: Turn off Broadcom tags for more switches	2018-01-04 09:57:12 -05:00
ethernet	Linux 4.15	2018-01-30 09:30:00 -07:00
fddi
fjes
hamradio	treewide: Remove TIMER_FUNC_TYPE and TIMER_DATA_TYPE casts	2017-11-21 16:35:54 -08:00
hippi	hippi: Fix a Fix a possible sleep-in-atomic bug in rr_close	2017-12-13 14:52:57 -05:00
hyperv	hv_netvsc: preserve hw_features on mtu/channels/ringparam changes	2017-11-16 10:49:00 +09:00
ieee802154
ipvlan	ipvlan: Add the skb->mark as flow4's member to lookup route	2017-12-03 09:44:02 -05:00
phy	mdio-sun4i: Fix a memory leak	2018-01-08 14:30:28 -05:00
plip
ppp	pppoe: take ->needed_headroom of lower device into account on xmit	2018-01-23 19:44:44 -05:00
slip	treewide: setup_timer() -> timer_setup()	2017-11-21 15:57:07 -08:00
team
usb	usbnet: silence an unnecessary warning	2018-01-22 15:32:09 -05:00
vmxnet3	vmxnet3: repair memory leak	2018-01-23 19:57:52 -05:00
wan	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-11-29 13:10:25 -08:00
wimax
wireless	wireless-drivers fixes for 4.15	2018-01-18 16:23:10 -05:00
xen-netback	xen-netback: Fix logging message with spurious period after newline	2017-12-06 15:10:32 -05:00
dummy.c
eql.c	treewide: setup_timer() -> timer_setup()	2017-11-21 15:57:07 -08:00
geneve.c	net: don't call update_pmtu unconditionally	2018-01-25 16:27:34 -05:00
gtp.c
ifb.c
Kconfig
LICENSE.SRC
loopback.c
macsec.c	genetlink: fix genlmsg_nlhdr()	2017-11-16 10:49:00 +09:00
macvlan.c	macvlan: Fix one possible double free	2018-01-02 13:30:14 -05:00
macvtap.c
Makefile
mdio.c
mii.c
netconsole.c
nlmon.c
ntb_netdev.c
rionet.c
sb1000.c
Space.c
sungem_phy.c
tap.c	tap: free skb if flags error	2017-12-02 21:31:03 -05:00
thunderbolt.c	net: thunderbolt: Stop using zero to mean no valid DMA mapping	2017-11-25 23:56:02 +09:00
tun.c	tun: fix a memory leak for tfile->tx_array	2018-01-17 15:08:28 -05:00
veth.c
virtio_net.c	virtio: bugfixes	2017-12-08 12:58:51 -08:00
vrf.c	net: vrf: Add support for sends to local broadcast address	2018-01-25 21:51:03 -05:00
vsockmon.c
vxlan.c	net: don't call update_pmtu unconditionally	2018-01-25 16:27:34 -05:00
xen-netfront.c	xen-netfront: enable device after manual module load	2018-01-08 14:17:03 -05:00