David S. Miller c4c5551df1 Merge ra.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux ...

All conflicts were trivial overlapping changes, so reasonably
easy to resolve.

Signed-off-by: David S. Miller <davem@davemloft.net>

2018-07-20 21:17:12 -07:00

..

appletalk

…

arcnet

…

bonding

net: allow ndo_select_queue to pass netdev

2018-07-09 13:41:34 -07:00

caif

…

can

treewide: kzalloc() -> kcalloc()

2018-06-12 16:19:22 -07:00

dsa

net: dsa: mv88e6xxx: Longer timeout for PTP TX timestamp

2018-07-18 15:05:38 -07:00

ethernet

Merge ra.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux

2018-07-20 21:17:12 -07:00

fddi

net: fddi: fix a possible null-ptr-deref

2018-06-08 18:47:46 -04:00

fjes

fjes: use currently unused variable my_epid and max_epid

2018-07-05 19:34:21 +09:00

hamradio

net/hamradio/6pack: remove redundant variable channel

2018-07-05 19:34:45 +09:00

hippi

treewide: kmalloc() -> kmalloc_array()

2018-06-12 16:19:22 -07:00

hyperv

Merge ra.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux

2018-07-20 21:17:12 -07:00

ieee802154

net: ieee802154: adf7242: Fix OCL calibration runs

2018-07-09 10:53:12 +02:00

ipvlan

ipvlan: call dev_change_flags when ipvlan mode is reset

2018-07-02 20:38:09 +09:00

netdevsim

netdevsim: add support for simultaneous driver and hw XDP

2018-07-13 20:26:35 +02:00

phy

Merge ra.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux

2018-07-20 21:17:12 -07:00

plip

…

ppp

Revert changes to convert to ->poll_mask() and aio IOCB_CMD_POLL

2018-06-28 10:40:47 -07:00

slip

treewide: kzalloc() -> kcalloc()

2018-06-12 16:19:22 -07:00

team

team: Publish team_port_get_rcu()

2018-07-11 23:10:19 -07:00

usb

Merge ra.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux

2018-07-20 21:17:12 -07:00

vmxnet3

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2018-05-21 16:01:54 -04:00

wan

drivers: net: lmc: remove redundant variable next_rx

2018-07-07 22:07:21 +09:00

wimax

wimax/i2400m: remove redundant variables ack_status, bcf and protocol

2018-07-11 22:54:25 -07:00

wireless

Merge ra.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux

2018-07-20 21:17:12 -07:00

xen-netback

net: allow fallback function to pass netdev

2018-07-09 13:57:25 -07:00

dummy.c

…

eql.c

…

geneve.c

Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net

2018-07-03 10:29:26 +09:00

gtp.c

gtp: constify nla_policy

2018-07-20 12:33:37 -07:00

ifb.c

ifb: fix packets checksum

2018-05-28 23:02:22 -04:00

Kconfig

virtio_net: Extend virtio to use VF datapath when available

2018-05-28 22:59:54 -04:00

LICENSE.SRC

…

loopback.c

…

macsec.c

…

macvlan.c

macvlan: Change status when lower device goes down

2018-07-11 23:07:22 -07:00

macvtap.c

…

Makefile

net: Introduce net_failover driver

2018-05-28 22:59:54 -04:00

mdio.c

…

mii.c

…

net_failover.c

net: allow fallback function to pass netdev

2018-07-09 13:57:25 -07:00

netconsole.c

…

nlmon.c

…

ntb_netdev.c

net: drivers/net: Convert random_ether_addr to eth_random_addr

2018-06-23 10:49:14 +09:00

rionet.c

…

sb1000.c

…

Space.c

…

sungem_phy.c

…

tap.c

net: in virtio_net_hdr only add VLAN_HLEN to csum_start if payload holds vlan

2018-06-07 16:15:38 -04:00

thunderbolt.c

…

tun.c

Merge ra.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux

2018-07-20 21:17:12 -07:00

veth.c

…

virtio_net.c

xdp: don't make drivers report attachment mode

2018-07-13 20:26:35 +02:00

vrf.c

vrf: add CRC32c offload to device features

2018-05-28 22:55:13 -04:00

vsockmon.c

…

vxlan.c

vxlan: fix default fdb entry netlink notify ordering during netdev create

2018-07-07 20:20:46 +09:00

xen-netfront.c

net: allow ndo_select_queue to pass netdev

2018-07-09 13:41:34 -07:00