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-02-26 09:24:48 -08:00
2013-03-27 13:39:09 -04:00
2013-01-28 18:17:25 -05:00
2013-02-26 15:03:06 -08:00
2013-02-21 15:27:22 -08:00
2013-01-30 07:54:34 -06:00
2013-02-13 08:35:43 -08:00
2013-01-03 15:41:20 +01:00
2013-03-01 13:39:00 -08:00
2013-03-08 16:03:29 -08:00
2013-03-02 16:31:21 +00:00
2013-02-20 11:00:43 -08:00
2013-03-03 12:06:09 -08:00
2013-02-28 18:02:55 -08:00
2013-03-28 15:51:33 -07:00
2013-04-07 16:55:46 -04:00
2013-02-24 14:37:22 -05:00
2013-03-14 12:48:54 +00:00
2013-04-22 20:32:51 -04:00
2012-11-30 12:01:30 -05:00
2013-02-13 06:16:08 -08:00
2013-02-15 09:52:29 +01:00
2013-03-13 04:38:19 -04:00
2013-02-16 13:34:10 -08:00
2013-01-02 17:36:10 -08:00
2013-03-01 06:07:22 +00:00
2013-02-22 09:20:11 -08:00
2013-04-16 16:34:07 -04:00
2013-04-22 20:32:51 -04:00
2013-03-02 16:46:07 -08:00
2013-04-11 15:57:32 -04:00
2013-01-29 11:47:06 +01:00
2013-03-02 09:34:39 -08:00
2013-01-03 14:34:06 -08:00
2012-12-14 13:06:41 +10:30
2013-01-23 09:32:30 -08:00
2013-01-03 15:57:16 -08:00
2013-04-03 19:33:40 -04:00
2012-12-10 15:49:57 -05:00
2012-12-02 00:05:12 +00:00
2013-01-11 14:54:56 -08:00
2013-02-21 17:22:19 -08:00
2012-12-17 17:15:16 -08:00
2012-12-11 17:22:26 -08:00
2013-03-01 12:47:16 +01:00
2013-02-26 02:46:13 -05:00
2013-01-11 19:53:53 +01:00
2013-04-18 09:00:26 -07:00
2013-02-15 18:52:45 -08:00
2013-02-23 17:50:12 -08:00
2012-12-06 14:33:02 +01:00
2013-02-20 09:37:28 -05:00
2013-01-14 15:00:36 +01:00
2013-02-21 17:22:16 -08:00
2013-04-14 10:06:31 -07:00
2013-01-24 12:05:18 -08:00
2013-01-24 11:09:28 -08:00
2013-01-31 22:15:36 +01:00
2013-01-31 19:57:30 -08:00
2013-03-20 13:23:21 -04:00
2013-02-13 06:00:53 -08:00
2013-02-23 17:50:10 -08:00
2013-03-19 19:15:52 +01:00
2013-02-21 17:22:15 -08:00
2013-02-21 17:22:15 -08:00
2013-02-21 17:22:15 -08:00
2012-12-06 01:22:31 +00:00
2013-02-21 17:22:16 -08:00
2013-02-15 16:45:06 +01:00
2013-02-25 16:46:44 -08:00
2013-01-26 17:37:17 +01:00
2012-11-29 00:01:25 -05:00
2012-11-22 15:59:52 +08:00
2013-01-11 14:54:54 -08:00
2013-02-02 01:29:32 +01:00
2013-02-11 18:49:51 -05:00
2012-12-12 17:38:32 -08:00
2013-01-09 08:26:53 -08:00
2013-02-26 02:46:09 -05:00
2013-03-31 11:38:33 -07:00
2013-01-18 15:25:53 -08:00
2013-04-02 01:28:41 +02:00
2013-03-01 22:45:49 +00:00
2013-02-21 12:05:51 -08:00
2013-03-01 22:45:49 +00:00
2012-11-29 03:30:34 -08:00
2013-02-27 15:13:36 +05:30
2012-12-11 09:28:09 +01:00
2013-02-27 22:37:34 +05:30
2012-12-24 09:36:38 -07:00
2013-02-28 09:53:21 +05:30
2013-01-17 12:19:09 -08:00
2013-03-03 23:59:59 -08:00
2013-03-16 06:32:30 +01:00
2013-04-09 11:34:05 +01:00
2013-02-28 12:52:24 -08:00
2013-02-26 02:46:08 -05:00
2013-01-21 14:07:44 -05:00
2013-02-27 19:10:23 -08:00
2012-12-20 14:04:11 -08:00
2012-11-22 13:43:27 +09:00
2012-12-11 13:43:45 +09:00
2013-01-24 09:04:04 +01:00
2012-11-28 21:49:02 -05:00
2013-03-29 23:31:34 -04:00
2013-02-23 17:50:12 -08:00
2013-03-31 11:38:33 -07:00
2013-03-27 07:49:29 -07:00
2013-03-03 19:36:31 -08:00
2012-12-20 22:34:00 +00:00
2012-12-20 22:04:07 +00:00
2012-11-26 13:41:19 -06:00
2012-12-11 13:44:36 -05:00
2013-02-22 23:31:31 -05:00
2013-01-30 11:02:06 -05:00
2013-04-12 17:12:41 -04:00
2013-02-26 03:10:52 +11:00
2012-12-18 15:02:12 -08:00
2013-01-22 10:23:35 +01:00
2013-02-22 00:05:07 +01:00
2013-03-18 10:21:23 +01:00
2013-02-27 19:10:24 -08:00
2013-02-22 08:20:05 +01:00
2013-01-06 11:48:11 +00:00
2013-01-06 11:41:12 +00:00
2013-02-21 10:45:01 +01:00
2013-02-23 17:50:16 -08:00
2013-02-23 17:50:17 -08:00
2012-12-18 15:02:15 -08:00
2013-02-26 20:16:07 -08:00
2013-01-25 21:03:54 -08:00
2013-01-25 11:17:31 -08:00
2012-11-28 11:36:32 +01:00
2012-11-23 12:23:40 +01:00
2013-03-13 15:21:47 -07:00
2013-03-06 16:36:03 +01:00
2013-03-26 12:32:13 -04:00
2013-02-06 15:59:47 -05:00
2013-03-06 14:55:20 -05:00
2013-04-21 15:56:59 -04:00
2012-12-14 13:05:26 +10:30
2013-02-11 14:16:26 -05:00
2013-01-29 13:59:57 -05:00
2013-02-19 08:06:01 +01:00
2013-01-23 09:31:01 -08:00
2013-01-11 14:54:54 -08:00
2013-02-06 10:47:28 +01:00
2012-12-09 00:20:28 -05:00
2012-11-21 15:09:26 -08:00
2013-01-04 16:11:45 -08:00
2013-02-27 19:10:21 -08:00
2013-01-30 22:41:13 -05:00
2013-03-22 16:41:19 -07:00
2013-01-28 12:17:25 +01:00
2013-01-10 11:44:38 -06:00
2013-02-09 16:29:20 -05:00
2013-01-27 19:23:27 +01:00
2013-03-22 16:41:20 -07:00
2013-04-17 12:35:33 -07:00
2012-12-16 15:40:50 -08:00
2013-02-04 15:35:26 -08:00
2012-11-28 10:33:03 -08:00
2013-01-21 13:22:36 -05:00
2013-02-23 17:50:19 -08:00
2013-04-19 16:39:13 -04:00
2013-04-07 13:05:35 +03:00
2013-04-07 13:05:35 +03:00
2013-02-01 17:47:04 -08:00
2012-11-26 14:28:51 -08:00
2013-04-03 19:33:43 -04:00
2013-01-06 01:11:25 -08:00
2013-03-14 13:18:30 -07:00
2013-02-19 15:17:08 -05:00
2013-02-22 19:25:09 -08:00
2012-11-30 11:48:05 +01:00
2012-12-17 13:39:11 -08:00
2013-02-20 19:36:01 +01:00
2013-02-02 00:01:15 +01:00
2013-03-02 09:34:39 -08:00
2013-02-23 17:50:20 -08:00
2013-02-23 17:50:13 -08:00
2012-12-12 17:38:33 -08:00
2013-01-02 17:32:13 -08:00
2013-03-12 06:50:58 -04:00
2013-02-23 17:50:19 -08:00
2012-12-01 10:07:54 +00:00
2013-02-23 17:50:17 -08:00
2013-04-16 16:45:45 -07:00
2013-03-28 17:45:51 -07:00
2013-02-05 20:38:48 +11:00
2013-03-22 16:41:20 -07:00
2013-01-24 22:48:04 +01:00
2013-01-21 17:18:20 +10:30
2012-12-14 13:06:40 +10:30
2013-03-27 07:50:04 -07:00
2013-01-21 13:55:14 -05:00
2013-01-21 13:55:14 -05:00
2013-01-04 16:11:45 -08:00
2013-03-22 10:25:15 -04:00
2013-03-19 11:07:58 +08:00
2012-12-25 18:45:06 -05:00
2013-04-19 14:46:06 -04:00
2013-04-19 14:45:27 -04:00
2013-04-05 21:08:11 +02:00
2013-04-19 14:57:58 -04:00
2013-02-11 19:19:33 -05:00
2013-02-13 06:16:06 -08:00
2012-12-06 00:30:46 +01:00
2013-02-13 06:15:29 -08:00
2013-03-02 16:46:07 -08:00
2012-12-11 17:22:27 -08:00
2012-12-12 17:38:34 -08:00
2013-01-17 19:11:14 -08:00
2012-11-23 22:01:15 +00:00
2013-01-07 22:05:02 -08:00
2013-02-13 10:11:53 +00:00
2012-12-11 17:30:16 +00:00
2013-04-02 16:43:09 -04:00
2012-12-19 16:15:17 +00:00
2013-02-13 10:09:31 +00:00
2012-11-30 08:41:50 -08:00
2012-12-11 17:22:27 -08:00
2013-03-29 17:54:33 -07:00
2013-02-23 00:30:08 +01:00
2013-02-23 17:50:17 -08:00
2013-02-14 15:55:23 +01:00
2013-02-23 17:50:15 -08:00
2013-02-21 17:22:19 -08:00
2013-03-01 23:51:07 -05:00
2013-02-28 20:42:33 -08:00
2013-03-26 17:19:41 -06:00
2013-02-05 11:54:06 +01:00
2012-12-17 17:15:18 -08:00
2013-03-17 15:59:15 -07:00
2013-03-12 11:40:53 -04:00
2012-12-25 16:10:05 -08:00
2013-02-27 19:10:24 -08:00
2013-01-17 17:39:33 -08:00
2013-01-23 14:39:19 +00:00
2013-02-23 17:50:16 -08:00
2013-02-23 17:50:16 -08:00
2013-02-21 12:05:51 -08:00
2013-02-13 09:40:35 -08:00
2013-04-09 10:48:33 -07:00
2013-03-22 16:41:20 -07:00
2013-04-09 14:09:17 -04:00
2013-01-24 15:37:26 +01:00
2013-01-03 15:57:14 -08:00
2013-01-11 10:20:50 -08:00
2013-01-20 12:26:05 -08:00
2012-11-27 23:29:12 -02:00
2013-02-26 09:34:29 -08:00
2013-02-08 13:14:40 +00:00
2013-01-24 23:24:56 -05:00
2013-01-23 13:44:00 -05:00
2013-01-11 14:54:56 -08:00
2013-02-27 19:10:24 -08:00
2013-01-28 22:25:21 -08:00
2013-02-14 17:11:09 +00:00
2013-03-13 15:21:44 -07:00
2013-01-30 11:01:53 -05:00
2013-02-23 17:50:17 -08:00
2013-02-21 12:05:51 -08:00
2013-03-07 15:29:45 -05:00
2013-01-16 12:13:20 -08:00
2013-02-27 19:10:10 -08:00
2013-04-12 14:18:43 +02:00
2013-04-09 13:19:39 -04:00
2013-04-10 15:40:39 -04:00
2013-02-19 08:43:34 +01:00
2013-01-15 23:03:00 -08:00
2013-02-13 10:13:58 -08:00
2013-03-29 15:31:30 -04:00
2012-12-11 17:22:25 -08:00
2013-03-19 19:15:52 +01:00
2013-04-19 14:57:57 -04:00
2012-12-18 15:02:13 -08:00
2012-12-18 15:02:14 -08:00
2012-12-18 15:02:14 -08:00
2013-02-21 17:22:20 -08:00
2013-02-26 22:25:17 +01:00
2012-12-07 12:48:00 -05:00
2013-03-10 22:20:05 +01:00
2013-04-09 10:48:33 -07:00
2013-02-07 15:15:00 -08:00
2012-12-13 12:00:02 -08:00
2013-03-01 12:40:36 +01:00
2012-12-17 17:15:17 -08:00
2013-02-13 12:15:50 -08:00
2012-12-24 09:36:38 -07:00
2013-02-09 22:30:44 +01:00
2013-02-23 17:50:22 -08:00
2013-04-17 12:35:32 -07:00
2013-02-14 09:21:15 -05:00
2013-01-25 21:51:13 +01:00
2013-03-21 11:47:51 -04:00
2013-01-28 11:19:06 -07:00
2013-03-20 17:56:58 -04:00
2012-12-18 15:02:13 -08:00
2013-02-05 00:48:46 +01:00
2013-02-21 14:58:40 -08:00
2013-01-27 19:23:31 +01:00
2013-02-04 15:40:28 -08:00
2013-01-15 22:43:15 -08:00
2013-02-13 10:13:58 -08:00
2013-01-18 16:15:27 -08:00
2012-12-11 17:22:27 -08:00
2013-04-15 21:23:03 +01:00
2013-03-20 12:10:38 -04:00
2013-02-08 18:28:04 +01:00
2013-01-25 15:06:01 -08:00
2013-03-27 07:50:08 -07:00
2013-02-14 00:22:58 +01:00
2013-03-22 10:23:34 -04:00
2013-02-23 17:50:15 -08:00
2013-03-08 12:24:48 -05:00
2013-02-23 17:50:16 -08:00
2013-01-08 16:15:57 -08:00
2013-01-08 16:15:57 -08:00
2013-02-08 12:13:43 +10:00
2013-01-27 20:35:47 +01:00
2012-11-30 11:47:57 +01:00
2013-01-31 19:56:35 -05:00
2013-03-01 12:48:36 +01:00
2013-02-08 10:05:02 +02:00
2013-02-13 19:29:12 -08:00
2013-01-12 10:47:43 +08:00
6e0895c2ea