iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
linux/net
History
David S. Miller 3efa70d78f Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
The conflict was an interaction between a bug fix in the
netvsc driver in 'net' and an optimization of the RX path
in 'net-next'.

Signed-off-by: David S. Miller <davem@davemloft.net>
2017-02-07 16:29:30 -05:00
..
6lowpan
6lowpan: use rb_entry()
2017-01-22 16:46:13 -05:00
9p
IB/core: add support to create a unsafe global rkey to ib_create_pd
2016-09-23 13:47:44 -04:00
802
Replace <asm/uaccess.h> with <linux/uaccess.h> globally
2016-12-24 11:46:01 -08:00
8021q
net: remove ndo_neigh_{construct, destroy} from stacked devices
2017-02-06 11:25:57 -05:00
appletalk
appletalk: use IS_ENABLED() instead of checking for built-in or module
2016-09-10 21:19:10 -07:00
atm
net: atm: Fix warnings in net/atm/lec.c when !CONFIG_PROC_FS
2016-12-28 15:11:32 -05:00
ax25
ax25: Fix segfault after sock connection timeout
2017-01-16 14:39:58 -05:00
batman-adv
Here are two fixes for batman-adv for net-next:
2017-01-29 19:21:26 -05:00
bluetooth
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2016-12-16 10:24:44 -08:00
bridge
bridge: avoid unnecessary read of jiffies
2017-02-07 14:16:05 -05:00
caif
net: caif: Remove unused stats member from struct chnl_net
2017-01-19 11:45:21 -05:00
can
can: bcm: fix hrtimer/tasklet termination in bcm op removal
2017-01-30 11:05:04 +01:00
ceph
libceph: make sure ceph_aes_crypt() IV is aligned
2017-01-18 17:58:45 +01:00
core
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2017-02-07 16:29:30 -05:00
dcb
net: dcb: set error code on failures
2016-12-03 23:54:25 -05:00
dccp
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2017-01-28 10:33:06 -05:00
decnet
Replace <asm/uaccess.h> with <linux/uaccess.h> globally
2016-12-24 11:46:01 -08:00
dns_resolver
…
dsa
net: dsa: Do not clobber PHY link outside of state machine
2017-02-07 13:48:22 -05:00
ethernet
net: add devm version of alloc_etherdev_mqs function
2017-01-29 19:24:12 -05:00
hsr
net-next: treewide use is_vlan_dev() helper function.
2017-02-06 16:33:29 -05:00
ieee802154
Makefile: drop -D__CHECK_ENDIAN__ from cflags
2016-12-16 00:13:43 +02:00
ife
net: Introduce ife encapsulation module
2017-02-03 15:16:45 -05:00
ipv4
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2017-02-07 16:29:30 -05:00
ipv6
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2017-02-07 16:29:30 -05:00
ipx
ktime: Get rid of the union
2016-12-25 17:21:22 +01:00
irda
Replace <asm/uaccess.h> with <linux/uaccess.h> globally
2016-12-24 11:46:01 -08:00
iucv
net/af_iucv: don't use paged skbs for TX on HiperSockets
2017-01-10 21:08:29 -05:00
kcm
Merge branch 'work.splice_read' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2016-10-07 15:36:58 -07:00
key
netns: make struct pernet_operations::id unsigned int
2016-11-18 10:59:15 -05:00
l2tp
net: use dst_confirm_neigh for UDP, RAW, ICMP, L2TP
2017-02-07 13:07:47 -05:00
l3mdev
net: ipv6: Remove l3mdev_get_saddr6
2016-09-10 23:12:53 -07:00
lapb
Replace <asm/uaccess.h> with <linux/uaccess.h> globally
2016-12-24 11:46:01 -08:00
llc
net: fix sleeping for sk_wait_event()
2016-11-14 13:17:21 -05:00
mac80211
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2017-02-07 16:29:30 -05:00
mac802154
ktime: Cleanup ktime_set() usage
2016-12-25 17:21:22 +01:00
mpls
lwtunnel: remove device arg to lwtunnel_build_state
2017-01-30 15:14:22 -05:00
ncsi
net/ncsi: Improve HNCDSC AEN handler
2016-10-20 11:23:08 -04:00
netfilter
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next
2017-02-03 16:58:20 -05:00
netlabel
netlabel: add CALIPSO to the list of built-in protocols
2017-01-06 22:20:45 -05:00
netlink
net: adjust skb->truesize in pskb_expand_head()
2017-01-27 12:03:29 -05:00
netrom
…
nfc
genetlink: mark families as __ro_after_init
2016-10-27 16:16:09 -04:00
openvswitch
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next
2017-02-03 16:58:20 -05:00
packet
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2017-01-28 10:33:06 -05:00
phonet
netns: make struct pernet_operations::id unsigned int
2016-11-18 10:59:15 -05:00
psample
net: Introduce psample, a new genetlink channel for packet sampling
2017-01-24 13:44:28 -05:00
qrtr
net: qrtr: Mark 'buf' as little endian
2017-01-10 20:45:04 -05:00
rds
RDS: validate the requested traces user input against max supported
2017-01-06 22:14:26 -05:00
rfkill
rfkill: Add rfkill-any LED trigger
2017-01-09 11:40:33 +01:00
rose
Replace <asm/uaccess.h> with <linux/uaccess.h> globally
2016-12-24 11:46:01 -08:00
rxrpc
rxrpc: Allow listen(sock, 0) to be used to disable listening
2017-01-09 11:10:02 +00:00
sched
net/sched: act_mirred: remove duplicated include from act_mirred.c
2017-02-07 11:42:34 -05:00
sctp
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2017-02-07 16:29:30 -05:00
smc
smc: some potential use after free bugs
2017-01-30 16:37:55 -05:00
strparser
strparser: Propagate correct error code in strp_recv()
2016-10-12 01:51:49 -04:00
sunrpc
svcrpc: fix oops in absence of krb5 module
2017-01-31 12:29:24 -05:00
switchdev
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2016-10-30 12:42:58 -04:00
tipc
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2017-01-28 10:33:06 -05:00
unix
unix: add ioctl to open a unix socket file with O_PATH
2017-02-02 21:58:02 -05:00
vmw_vsock
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2016-12-17 20:17:04 -08:00
wimax
genetlink: mark families as __ro_after_init
2016-10-27 16:16:09 -04:00
wireless
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2017-02-07 16:29:30 -05:00
x25
Replace <asm/uaccess.h> with <linux/uaccess.h> globally
2016-12-24 11:46:01 -08:00
xfrm
net: add confirm_neigh method to dst_ops
2017-02-07 13:07:46 -05:00
compat.c
net: Assert at build time the assumptions we make about the CMSG header.
2017-01-04 13:24:19 -05:00
Kconfig
net: Introduce ife encapsulation module
2017-02-03 15:16:45 -05:00
Makefile
net: Introduce ife encapsulation module
2017-02-03 15:16:45 -05:00
socket.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2017-01-11 14:43:39 -05:00
sysctl_net.c
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace
2016-10-06 09:52:23 -07:00