David S. Miller
6e0895c2ea
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...
Conflicts:
drivers/net/ethernet/emulex/benet/be_main.c
drivers/net/ethernet/intel/igb/igb_main.c
drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
include/net/scm.h
net/batman-adv/routing.c
net/ipv4/tcp_input.c
The e{uid,gid} --> {uid,gid} credentials fix conflicted with the
cleanup in net-next to now pass cred structs around.
The be2net driver had a bug fix in 'net' that overlapped with the VLAN
interface changes by Patrick McHardy in net-next.
An IGB conflict existed because in 'net' the build_skb() support was
reverted, and in 'net-next' there was a comment style fix within that
code.
Several batman-adv conflicts were resolved by making sure that all
calls to batadv_is_my_mac() are changed to have a new bat_priv first
argument.
Eric Dumazet's TS ECR fix in TCP in 'net' conflicted with the F-RTO
rewrite in 'net-next', mostly overlapping changes.
Thanks to Stephen Rothwell and Antonio Quartulli for help with several
of these merge resolutions.
Signed-off-by: David S. Miller <davem@davemloft.net>
2013-04-22 20:32:51 -04:00
2013-03-13 22:53:48 +01:00
2012-11-26 14:22:21 +01:00
2013-02-13 13:43:02 +01:00
2012-12-17 17:15:25 -08:00
2012-12-15 13:03:48 -08:00
2013-01-22 17:51:01 +00:00
2009-09-24 07:20:57 -07:00
2013-02-21 17:22:25 -08:00
2012-04-16 14:37:13 +02:00
2013-01-09 08:05:11 -08:00
2013-02-27 19:10:22 -08:00
2012-11-09 18:07:11 +05:30
2011-09-27 18:08:04 +02:00
2013-04-08 16:55:28 -04:00
2012-06-26 21:19:02 -07:00
2010-02-24 13:51:32 +01:00
2013-02-02 00:01:16 +01:00
2012-09-04 01:35:44 +02:00
2012-04-03 13:09:18 +02:00
2012-10-08 13:50:12 +10:30
2011-12-12 14:14:31 -08:00
2013-03-05 17:22:08 -08:00
2013-04-11 16:19:38 -04:00
2013-04-22 20:32:51 -04:00
2013-01-22 09:41:43 -08:00
2013-01-01 11:18:26 -02:00
2013-01-20 19:22:19 +10:00
2012-04-20 09:24:27 -07:00
2012-11-19 14:28:24 +01:00
2012-03-30 16:03:15 -07:00
2013-02-26 20:16:07 -08:00
2012-11-14 15:07:18 -08:00
2011-09-27 18:08:04 +02:00
2012-12-14 08:48:59 +01:00
2013-03-18 21:19:49 +01:00
2013-03-22 11:18:34 +01:00
2012-03-07 16:08:24 +01:00
2012-09-01 09:57:10 -07:00
2012-03-30 16:03:15 -07:00
2012-09-20 16:49:17 -04:00
2013-03-11 07:49:37 -07:00
2013-01-31 19:20:33 -05:00
2012-03-30 16:03:15 -07:00
2011-07-25 23:06:24 -07:00
2013-02-27 12:28:30 -08:00
2012-07-18 18:35:57 -07:00
2012-02-15 14:48:01 -08:00
2013-01-21 14:52:42 -08:00
2013-02-06 15:59:30 -08:00
2011-08-03 14:25:21 -10:00
2010-12-14 22:16:19 +01:00
2012-05-02 00:10:49 -07:00
2013-03-02 20:09:50 +00:00
2011-03-31 11:26:23 -03:00
2012-11-19 14:28:24 +01:00
2012-12-06 13:54:48 -05:00
2010-08-04 15:21:40 +02:00
2013-01-26 22:20:06 -08:00
2010-04-23 02:09:52 +02:00
2013-04-19 14:58:36 -04:00
2013-01-10 01:27:46 +01:00
2012-04-16 14:37:13 +02:00
2013-01-24 17:25:13 +01:00
2010-09-29 17:20:24 +02:00
2013-03-04 14:23:11 +01:00
2013-02-15 17:02:25 +11:00
2011-01-13 08:03:21 -08:00
2012-10-02 21:14:29 +10:00
2011-05-13 16:31:00 -07:00
2011-05-23 13:01:00 -07:00
2011-11-02 16:07:02 -07:00
2012-11-16 09:59:58 -08:00
2012-03-30 16:03:15 -07:00
2012-09-13 16:52:04 +02:00
2013-04-06 11:31:30 +01:00
2012-12-17 17:15:22 -08:00
2013-01-15 21:57:44 -08:00
2010-11-15 18:25:12 +09:00
2013-04-04 15:35:39 +02:00
2013-01-03 15:57:16 -08:00
2013-01-04 16:11:46 -08:00
2012-09-17 17:12:58 -07:00
2013-02-28 19:48:26 -08:00
2011-09-27 18:08:04 +02:00
2013-03-11 07:54:29 -07:00
2012-11-11 18:10:46 -08:00
2011-07-14 17:57:09 -07:00
2013-02-13 17:33:20 -02:00
2013-02-24 13:07:18 -08:00
2013-02-23 17:50:23 -08:00
2013-02-18 13:55:24 -08:00
2013-03-01 12:48:36 +01:00
2013-02-22 19:22:52 -08:00
2012-12-18 21:10:22 -08:00
2013-02-21 12:05:51 -08:00
2010-04-08 11:34:34 +02:00
2013-03-03 12:06:09 -08:00
2013-01-08 14:14:55 -08:00
2010-08-04 15:21:40 +02:00
2009-08-22 14:25:32 -07:00
2011-09-27 18:08:04 +02:00
2011-05-25 08:39:21 -07:00
2011-07-11 16:48:38 -07:00
2010-03-24 16:31:22 -07:00
2012-03-16 20:35:01 +00:00
2013-02-22 11:39:13 +01:00
2013-01-11 11:38:03 -08:00
2012-11-14 09:39:44 -08:00
2010-09-09 20:41:25 +02:00
2012-03-23 16:58:37 -07:00
2009-10-03 09:28:11 +02:00
2011-03-31 11:26:23 -03:00
2012-11-21 13:03:01 -08:00
2011-11-09 12:10:37 +02:00
2013-02-27 19:10:23 -08:00
2012-10-24 17:06:43 +02:00
2012-11-29 03:30:34 -08:00
2013-02-27 15:13:36 +05:30
2012-03-07 16:08:24 +01:00
2012-11-19 14:10:53 +01:00
2013-01-17 12:19:09 -08:00
2012-07-29 21:11:05 -03:00
2012-05-17 19:06:13 -04:00
2011-08-13 18:34:03 -07:00
2011-04-28 16:12:47 -04:00
2009-09-21 15:14:56 +02:00
2012-11-11 19:06:00 +01:00
2012-12-10 15:54:27 +01:00
2011-09-21 19:45:34 +03:00
2010-03-06 11:26:29 -08:00
2012-05-25 16:18:34 +02:00
2013-01-11 11:38:03 -08:00
2009-09-19 09:37:23 -07:00
2011-03-23 20:44:18 +01:00
2013-02-27 19:10:21 -08:00
2011-05-25 08:39:45 -07:00
2012-12-05 23:52:10 +00:00
2011-03-31 11:26:23 -03:00
2012-11-27 21:08:57 +01:00
2011-09-27 18:08:04 +02:00
2013-04-20 18:40:36 -07:00
2011-12-02 16:12:42 +00:00
2012-09-04 16:06:34 -07:00
2010-11-01 15:38:34 -04:00
2012-11-28 18:36:06 +10:00
2010-08-04 15:21:40 +02:00
2011-12-11 10:31:23 -08:00
2013-02-19 08:42:37 +01:00
2012-02-11 15:11:28 +01:00
2013-01-31 19:20:33 -05:00
2012-05-09 13:59:09 -07:00
2012-06-28 12:03:15 +02:00
2011-12-23 10:17:51 +11:00
2013-02-08 13:27:13 -02:00
2013-01-08 14:14:55 -08:00
2012-12-12 17:38:33 -08:00
2012-03-30 16:03:15 -07:00
2010-09-03 08:19:51 +02:00
2009-12-15 08:53:24 -08:00
2012-02-28 16:05:06 +01:00
2011-11-07 07:54:42 +10:30
2010-08-11 08:59:18 -07:00
2012-03-30 16:03:15 -07:00
2012-09-26 19:56:15 +02:00
2013-01-23 16:39:51 +01:00
2010-02-05 12:22:44 +01:00
2013-03-08 15:05:34 -08:00
2012-09-10 17:05:45 +02:00
2012-09-06 22:16:58 -07:00
2012-10-09 16:22:40 +09:00
2012-09-18 12:53:22 +03:00
2011-09-27 18:08:04 +02:00
2013-01-03 15:57:16 -08:00
2010-06-05 17:39:09 +02:00
2012-10-06 03:05:01 +09:00
2011-03-31 11:26:23 -03:00
2012-10-01 15:27:48 +02:00
2012-12-17 17:15:23 -08:00
2011-07-11 12:45:04 -07:00
2011-03-30 12:02:05 +02:00
2012-06-25 12:11:58 -07:00
2012-04-16 14:37:13 +02:00
2011-07-25 20:57:17 -07:00
2011-08-13 18:34:03 -07:00
2013-03-08 15:05:34 -08:00
2010-03-16 11:47:56 +01:00
2012-10-16 09:34:01 -07:00
2012-09-21 10:48:03 -06:00
2012-01-02 13:04:55 +01:00
2012-05-08 16:01:34 -07:00
2010-03-24 16:31:20 -07:00
2012-07-13 22:24:45 -07:00
2011-01-13 08:03:24 -08:00
6e0895c2ea
