WSL2-Linux-Kernel/net/caif
David S. Miller 0fa74a4be4 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/ethernet/emulex/benet/be_main.c
	net/core/sysctl_net_core.c
	net/ipv4/inet_diag.c

The be_main.c conflict resolution was really tricky.  The conflict
hunks generated by GIT were very unhelpful, to say the least.  It
split functions in half and moved them around, when the real actual
conflict only existed solely inside of one function, that being
be_map_pci_bars().

So instead, to resolve this, I checked out be_main.c from the top
of net-next, then I applied the be_main.c changes from 'net' since
the last time I merged.  And this worked beautifully.

The inet_diag.c and sysctl_net_core.c conflicts were simple
overlapping changes, and were easily to resolve.

Signed-off-by: David S. Miller <davem@davemloft.net>
2015-03-20 18:51:09 -04:00
..
Kconfig Kconfig: replace "--- help ---" with "---help---" 2012-05-07 15:01:22 +02:00
Makefile caif: Add support for CAIF over CDC NCM USB interface 2011-12-05 18:27:56 -05:00
caif_dev.c net: Include appropriate header file in caif/caif_dev.c 2014-02-09 17:32:49 -08:00
caif_socket.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2015-03-20 18:51:09 -04:00
caif_usb.c caif_usb: use target structure member in memset 2014-10-14 16:05:45 -04:00
cfcnfg.c caif: Remove my bouncing email address. 2013-04-23 13:25:51 -04:00
cfctrl.c caif: remove unnecessary break after goto 2014-07-15 16:27:01 -07:00
cfdbgl.c caif: Remove my bouncing email address. 2013-04-23 13:25:51 -04:00
cfdgml.c caif: Remove my bouncing email address. 2013-04-23 13:25:51 -04:00
cffrml.c caif: fix a signedness bug in cfpkt_iterate() 2015-02-20 17:35:14 -05:00
cfmuxl.c caif: replace kmalloc/memset 0 by kzalloc 2014-10-14 16:04:07 -04:00
cfpkt_skbuff.c caif: fix a signedness bug in cfpkt_iterate() 2015-02-20 17:35:14 -05:00
cfrfml.c caif: Remove my bouncing email address. 2013-04-23 13:25:51 -04:00
cfserl.c caif: Remove my bouncing email address. 2013-04-23 13:25:51 -04:00
cfsrvl.c net: Include appropriate header file in caif/cfsrvl.c 2014-02-09 17:32:49 -08:00
cfutill.c caif: Remove my bouncing email address. 2013-04-23 13:25:51 -04:00
cfveil.c caif: Remove my bouncing email address. 2013-04-23 13:25:51 -04:00
cfvidl.c caif: Remove my bouncing email address. 2013-04-23 13:25:51 -04:00
chnl_net.c caif: remove wrong dev_net_set() call 2015-01-29 14:20:02 -08:00