David S. Miller e561bb29b6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Trivial conflict in net/core/filter.c, a locally computed
'sdif' is now an argument to the function.

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

2018-11-28 22:10:54 -08:00

..

6lowpan

…

9p

Merge branch 'work.afs' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

2018-11-03 10:35:52 -07:00

802

…

8021q

net: 8021q: move vlan offload registrations into vlan_core

2018-11-16 19:51:08 -08:00

appletalk

…

atm

Revert "net: simplify sock_poll_wait"

2018-10-23 10:57:06 -07:00

ax25

…

batman-adv

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

2018-11-19 10:55:00 -08:00

bluetooth

Merge branch 'work.afs' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

2018-11-01 19:58:52 -07:00

bpf

bpf: add tests for direct packet access from CGROUP_SKB

2018-10-19 13:49:34 -07:00

bpfilter

net: bpfilter: Set user mode helper's command line

2018-10-22 19:37:36 -07:00

bridge

net: bridge: export supported boolopts

2018-11-27 15:04:15 -08:00

caif

Revert "net: simplify sock_poll_wait"

2018-10-23 10:57:06 -07:00

can

can: raw: check for CAN FD capable netdev in raw_sendmsg()

2018-11-09 17:19:34 +01:00

ceph

libceph: fall back to sendmsg for slab pages

2018-11-19 17:59:47 +01:00

core

netns: enable to dump full nsid translation table

2018-11-27 16:20:20 -08:00

dcb

…

dccp

net: Convert protocol error handlers from void to int

2018-11-08 17:13:08 -08:00

decnet

net/decnet: add missing indentation

2018-11-16 19:42:49 -08:00

dns_resolver

…

dsa

rocker, dsa, ethsw: Don't filter VLAN events on bridge itself

2018-11-23 18:02:24 -08:00

ethernet

net: slightly optimize eth_type_trans

2018-11-15 15:10:59 -08:00

hsr

…

ieee802154

…

ife

…

ipv4

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

2018-11-28 22:10:54 -08:00

ipv6

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

2018-11-28 22:10:54 -08:00

iucv

iucv: Remove SKB list assumptions.

2018-11-10 16:55:11 -08:00

kcm

…

key

…

l2tp

l2tp: fix a sock refcnt leak in l2tp_tunnel_register

2018-11-14 22:49:31 -08:00

l3mdev

…

lapb

…

llc

llc: do not use sk_eat_skb()

2018-10-22 19:59:20 -07:00

mac80211

…

mac802154

…

mpls

net/mpls: Handle kernel side filtering of route dumps

2018-10-16 00:14:07 -07:00

ncsi

net/ncsi: Add NCSI Mellanox OEM command

2018-11-27 16:37:20 -08:00

netfilter

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

2018-11-28 22:10:54 -08:00

netlabel

…

netlink

netlink: Add answer_flags to netlink_callback

2018-10-16 00:13:12 -07:00

netrom

…

nfc

Merge branch 'work.tty-ioctl' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

2018-10-24 14:43:41 +01:00

nsh

…

openvswitch

OVS: remove VLAN_TAG_PRESENT - fixup

2018-11-10 13:42:16 -08:00

packet

packet: copy user buffers before orphan or clone

2018-11-23 11:08:03 -08:00

phonet

…

psample

…

qrtr

…

rds

…

rfkill

…

rose

…

rxrpc

rxrpc: Fix life check

2018-11-15 11:35:40 -08:00

sched

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

2018-11-24 17:01:43 -08:00

sctp

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

2018-11-28 22:10:54 -08:00

smc

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

2018-11-24 17:01:43 -08:00

strparser

…

sunrpc

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

2018-11-19 10:55:00 -08:00

switchdev

switchdev: Replace port obj add/del SDO with a notification

2018-11-23 18:02:24 -08:00

tipc

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

2018-11-28 22:10:54 -08:00

tls

Merge branch 'work.afs' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

2018-11-01 19:58:52 -07:00

unix

Revert "net: simplify sock_poll_wait"

2018-10-23 10:57:06 -07:00

vmw_vsock

…

wimax

…

wireless

…

x25

…

xdp

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

2018-10-19 11:03:06 -07:00

xfrm

Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2018-11-03 18:25:17 -07:00

compat.c

…

Kconfig

…

Makefile

…

socket.c

socket: do a generic_file_splice_read when proto_ops has no splice_read

2018-11-17 21:34:11 -08:00

sysctl_net.c

…