FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2025-01-11 11:56:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
linux/net
History
David S. Miller 1459143386 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/ieee802154/fakehard.c

A bug fix went into 'net' for ieee802154/fakehard.c, which is removed
in 'net-next'.

Add build fix into the merge from Stephen Rothwell in openvswitch, the
logging macros take a new initial 'log' argument, a new call was added
in 'net' so when we merge that in here we have to explicitly add the
new 'log' arg to it else the build fails.

Signed-off-by: David S. Miller <davem@davemloft.net>
2014-11-21 22:28:24 -05:00
..
6lowpan
6lowpan: move skb_free from error paths in decompression
2014-11-06 22:09:48 +01:00
9p
9p/trans_virtio: enable VQs early
2014-10-15 10:25:04 +10:30
802
net: set name_assign_type in alloc_netdev()
2014-07-15 16:12:48 -07:00
8021q
vlan: Pass ethtool get_ts_info queries to real device.
2014-11-21 15:35:53 -05:00
appletalk
net: Add and use skb_copy_datagram_msg() helper.
2014-11-05 16:46:40 -05:00
atm
net: Add and use skb_copy_datagram_msg() helper.
2014-11-05 16:46:40 -05:00
ax25
net: Add and use skb_copy_datagram_msg() helper.
2014-11-05 16:46:40 -05:00
batman-adv
batman-adv: replace strnicmp with strncasecmp
2014-10-14 02:18:24 +02:00
bluetooth
Merge tag 'master-2014-11-20' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next
2014-11-21 16:39:45 -05:00
bridge
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2014-11-21 22:28:24 -05:00
caif
net: Add and use skb_copy_datagram_msg() helper.
2014-11-05 16:46:40 -05:00
can
…
ceph
libceph: change from BUG to WARN for __remove_osd() asserts
2014-11-13 22:26:34 +03:00
core
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2014-11-21 22:28:24 -05:00
dcb
dcbnl : Disable software interrupts before taking dcb_lock
2014-11-16 14:50:52 -05:00
dccp
dccp: spelling s/reseting/resetting
2014-11-18 15:26:32 -05:00
decnet
neigh: remove dynamic neigh table registration support
2014-11-11 15:23:54 -05:00
dns_resolver
Merge commit 'v3.16' into next
2014-10-01 00:44:04 +10:00
dsa
net: dsa: replace count*size kzalloc by kcalloc
2014-11-16 14:41:39 -05:00
ethernet
net: Add function for parsing the header length out of linear ethernet frames
2014-09-05 17:47:02 -07:00
hsr
net/hsr: Remove left-over never-true conditional code.
2014-07-11 15:04:40 -07:00
ieee802154
Merge tag 'master-2014-11-20' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next
2014-11-21 16:39:45 -05:00
ipv4
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2014-11-21 22:28:24 -05:00
ipv6
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2014-11-21 22:28:24 -05:00
ipx
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2014-11-21 22:28:24 -05:00
irda
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2014-11-14 01:01:12 -05:00
iucv
net: Add and use skb_copy_datagram_msg() helper.
2014-11-05 16:46:40 -05:00
key
net: Add and use skb_copy_datagram_msg() helper.
2014-11-05 16:46:40 -05:00
l2tp
l2tp_eth: allow to set a specific mac address
2014-11-21 14:16:38 -05:00
lapb
lapb: move EXPORT_SYMBOL after functions.
2014-10-24 15:51:42 -04:00
llc
net: Add and use skb_copy_datagram_msg() helper.
2014-11-05 16:46:40 -05:00
mac80211
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2014-11-21 22:28:24 -05:00
mac802154
ieee802154: fix byteorder for short address and panid
2014-11-17 09:49:17 +01:00
mpls
net: Remove MPLS GSO feature.
2014-11-05 23:52:33 -08:00
netfilter
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2014-11-21 22:28:24 -05:00
netlabel
netlabel: kernel-doc warning fix
2014-10-09 01:40:05 -04:00
netlink
netlink: Deletion of an unnecessary check before the function call "__module_get"
2014-11-19 15:27:40 -05:00
netrom
net: Add and use skb_copy_datagram_msg() helper.
2014-11-05 16:46:40 -05:00
nfc
net: Add and use skb_copy_datagram_msg() helper.
2014-11-05 16:46:40 -05:00
openvswitch
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2014-11-21 22:28:24 -05:00
packet
packet: make packet_snd fail on len smaller than l2 header
2014-11-21 14:43:07 -05:00
phonet
net: Convert LIMIT_NETDEBUG to net_dbg_ratelimited
2014-11-11 14:10:31 -05:00
rds
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2014-10-18 09:31:37 -07:00
rfkill
net: rfkill: kernel-doc warning fixes
2014-10-09 11:16:15 +02:00
rose
net: Add and use skb_copy_datagram_msg() helper.
2014-11-05 16:46:40 -05:00
rxrpc
net: Add and use skb_copy_datagram_msg() helper.
2014-11-05 16:46:40 -05:00
sched
sched: introduce vlan action
2014-11-21 14:20:18 -05:00
sctp
net: sctp: keep owned chunk in destructor_arg instead of skb->cb
2014-11-21 14:46:12 -05:00
sunrpc
sunrpc: fix sleeping under rcu_read_lock in gss_stringify_acceptor
2014-11-13 13:15:49 -05:00
tipc
tipc: add name table dump to new netlink api
2014-11-21 15:01:32 -05:00
unix
net: Add and use skb_copy_datagram_msg() helper.
2014-11-05 16:46:40 -05:00
vmw_vsock
net: Add and use skb_copy_datagram_msg() helper.
2014-11-05 16:46:40 -05:00
wimax
wimax: convert printk to pr_foo()
2014-10-07 20:28:44 -04:00
wireless
nl80211: Broadcast CMD_NEW_INTERFACE and CMD_DEL_INTERFACE
2014-11-19 19:02:42 +01:00
x25
net: Add and use skb_copy_datagram_msg() helper.
2014-11-05 16:46:40 -05:00
xfrm
net: skb_fclone_busy() needs to detect orphaned skb
2014-10-30 19:58:30 -04:00
compat.c
fold verify_iovec() into copy_msghdr_from_user()
2014-11-19 16:23:49 -05:00
Kconfig
bpf: split eBPF out of NET
2014-10-27 19:09:59 -04:00
Makefile
6lowpan: introduce new net/6lowpan directory
2014-07-12 01:53:30 +02:00
nonet.c
…
socket.c
fold verify_iovec() into copy_msghdr_from_user()
2014-11-19 16:23:49 -05:00
sysctl_net.c
…