shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-05-05 11:45:25 +09:00
Code Issues Packages Projects Releases Wiki Activity
Files
cdffcf1bc721032d261a7a9da353b41f0d830410
linux/net
History
David S. Miller 0c1072ae02 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/ethernet/freescale/fec_main.c
	drivers/net/ethernet/renesas/sh_eth.c
	net/ipv4/gre.c

The GRE conflict is between a bug fix (kfree_skb --> kfree_skb_list)
and the splitting of the gre.c code into seperate files.

The FEC conflict was two sets of changes adding ethtool support code
in an "!CONFIG_M5272" CPP protected block.

Finally the sh_eth.c conflict was between one commit add bits set
in the .eesr_err_check mask whilst another commit removed the
.tx_error_check member and assignments.

Signed-off-by: David S. Miller <davem@davemloft.net>
2013-07-03 14:55:13 -07:00
..
9p
Merge tag '9p-3.10-bug-fix-1' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs
2013-06-10 17:35:25 -07:00
802
net/802/mrp: fix lockdep splat
2013-05-14 13:02:30 -07:00
8021q
net: pass info struct via netdevice notifier
2013-05-28 13:11:01 -07:00
appletalk
net: pass info struct via netdevice notifier
2013-05-28 13:11:01 -07:00
atm
net: always pass struct netdev_notifier_info to netdevice notifiers
2013-05-28 21:58:54 -07:00
ax25
net: Convert uses of typedef ctl_table to struct ctl_table
2013-06-13 02:36:09 -07:00
batman-adv
net: Unmap fragment page once iterator is done
2013-06-24 01:46:01 -07:00
bluetooth
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
2013-06-26 12:01:42 -04:00
bridge
bridge: check for zero ether address in fdb add
2013-06-25 16:59:27 -07:00
caif
net: pass info struct via netdevice notifier
2013-05-28 13:11:01 -07:00
can
net: pass info struct via netdevice notifier
2013-05-28 13:11:01 -07:00
ceph
libceph: must hold mutex for reset_changed_osds()
2013-05-17 12:45:40 -05:00
core
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2013-07-03 14:55:13 -07:00
dcb
rtnetlink: Remove passing of attributes into rtnl_doit functions
2013-03-22 10:31:16 -04:00
dccp
tcp: Remove TCPCT
2013-03-17 14:35:13 -04:00
decnet
net: Convert uses of typedef ctl_table to struct ctl_table
2013-06-13 02:36:09 -07:00
dns_resolver
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
2012-12-16 15:40:50 -08:00
dsa
dsa: fix freeing of sparse port allocation
2013-03-25 12:23:41 -04:00
ethernet
net: add ETH_P_802_3_MIN
2013-03-28 01:20:42 -04:00
ieee802154
net: pass info struct via netdevice notifier
2013-05-28 13:11:01 -07:00
ipv4
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2013-07-03 14:55:13 -07:00
ipv6
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2013-07-03 14:55:13 -07:00
ipx
net: pass info struct via netdevice notifier
2013-05-28 13:11:01 -07:00
irda
net: Convert uses of typedef ctl_table to struct ctl_table
2013-06-13 02:36:09 -07:00
iucv
net: pass info struct via netdevice notifier
2013-05-28 13:11:01 -07:00
key
af_key: fix info leaks in notify messages
2013-06-26 15:15:54 -07:00
l2tp
l2tp: make datapath resilient to packet loss when sequence numbers enabled
2013-07-02 16:33:25 -07:00
lapb
net/lapb: remove depends on CONFIG_EXPERIMENTAL
2013-01-11 11:40:01 -08:00
llc
llc: Fix missing msg_namelen update in llc_ui_recvmsg()
2013-04-07 16:28:01 -04:00
mac80211
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
2013-06-28 13:18:21 -04:00
mac802154
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2013-04-30 03:55:20 -04:00
mpls
MPLS: Add limited GSO support
2013-05-27 22:50:59 -07:00
netfilter
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2013-07-03 14:55:13 -07:00
netlabel
net: pass info struct via netdevice notifier
2013-05-28 13:11:01 -07:00
netlink
netlink: fix splat in skb_clone with large messages
2013-06-27 22:44:16 -07:00
netrom
net: Convert uses of typedef ctl_table to struct ctl_table
2013-06-13 02:36:09 -07:00
nfc
NFC: llcp: Fix the well known services endianness
2013-06-14 13:45:10 +02:00
openvswitch
openvswitch: Add Kconfig dependency on GRE-DEMUX.
2013-07-01 13:19:43 -07:00
packet
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2013-06-19 16:49:39 -07:00
phonet
net: Convert uses of typedef ctl_table to struct ctl_table
2013-06-13 02:36:09 -07:00
rds
net: Convert uses of typedef ctl_table to struct ctl_table
2013-06-13 02:36:09 -07:00
rfkill
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
2013-04-22 14:58:14 -04:00
rose
net: Convert uses of typedef ctl_table to struct ctl_table
2013-06-13 02:36:09 -07:00
rxrpc
Merge tag 'driver-core-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
2013-02-21 12:05:51 -08:00
sched
netem: use rb tree to implement the time queue
2013-07-01 18:07:15 -07:00
sctp
sctp: use get_unused_fd_flags(0) instead of get_unused_fd()
2013-07-02 16:14:11 -07:00
sunrpc
net: Convert uses of typedef ctl_table to struct ctl_table
2013-06-13 02:36:09 -07:00
tipc
tipc: remove dev_base_lock use from enable_bearer
2013-06-17 15:53:01 -07:00
unix
net: Convert uses of typedef ctl_table to struct ctl_table
2013-06-13 02:36:09 -07:00
vmw_vsock
VSOCK: Fix VSOCK_HASH and VSOCK_CONN_HASH
2013-06-23 23:51:48 -07:00
wimax
net: cleanup unsigned to unsigned int
2012-04-15 12:44:40 -04:00
wireless
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
2013-06-28 13:18:21 -04:00
x25
x25: Fix broken locking in ioctl error paths.
2013-07-01 18:15:25 -07:00
xfrm
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next
2013-06-26 13:23:13 -07:00
compat.c
net: Unbreak compat_sys_{send,recv}msg
2013-06-06 11:52:14 -07:00
Kconfig
net: remove NET_LL_RX_POLL config menue
2013-06-17 15:48:14 -07:00
Makefile
MPLS: Add limited GSO support
2013-05-27 22:50:59 -07:00
nonet.c
…
socket.c
net: poll/select low latency socket support
2013-06-25 16:35:52 -07:00
sysctl_net.c
user_ns: get rid of duplicate code in net_ctl_permissions
2012-11-18 20:32:45 -05:00