TWxSoftware/twx-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
40710cf9ad234778eb8b10ef07d922f435005cf7
twx-linux/net
T
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
…
802
…
8021q
net: remove ndo_neigh_{construct, destroy} from stacked devices
2017-02-06 11:25:57 -05:00
appletalk
…
atm
…
ax25
…
batman-adv
Merge tag 'batadv-next-for-davem-20170128' of git://git.open-mesh.org/linux-merge
2017-01-29 19:21:26 -05:00
bluetooth
…
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
…
dccp
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2017-01-28 10:33:06 -05:00
decnet
…
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
…
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
…
irda
…
iucv
…
kcm
…
key
…
l2tp
net: use dst_confirm_neigh for UDP, RAW, ICMP, L2TP
2017-02-07 13:07:47 -05:00
l3mdev
…
lapb
…
llc
…
mac80211
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2017-02-07 16:29:30 -05:00
mac802154
…
mpls
lwtunnel: remove device arg to lwtunnel_build_state
2017-01-30 15:14:22 -05:00
ncsi
…
netfilter
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next
2017-02-03 16:58:20 -05:00
netlabel
…
netlink
net: adjust skb->truesize in pskb_expand_head()
2017-01-27 12:03:29 -05:00
netrom
…
nfc
…
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
…
psample
net: Introduce psample, a new genetlink channel for packet sampling
2017-01-24 13:44:28 -05:00
qrtr
…
rds
…
rfkill
…
rose
…
rxrpc
…
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
…
sunrpc
svcrpc: fix oops in absence of krb5 module
2017-01-31 12:29:24 -05:00
switchdev
…
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
…
wimax
…
wireless
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2017-02-07 16:29:30 -05:00
x25
…
xfrm
net: add confirm_neigh method to dst_ops
2017-02-07 13:07:46 -05:00
compat.c
…
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
…
sysctl_net.c
…