David S. Miller f8ddadc4db
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...
There were quite a few overlapping sets of changes here.
Daniel's bug fix for off-by-ones in the new BPF branch instructions,
along with the added allowances for "data_end > ptr + x" forms
collided with the metadata additions.
Along with those three changes came veritifer test cases, which in
their final form I tried to group together properly. If I had just
trimmed GIT's conflict tags as-is, this would have split up the
meta tests unnecessarily.
In the socketmap code, a set of preemption disabling changes
overlapped with the rename of bpf_compute_data_end() to
bpf_compute_data_pointers().
Changes were made to the mv88e6060.c driver set addr method
which got removed in net-next.
The hyperv transport socket layer had a locking change in 'net'
which overlapped with a change of socket state macro usage
in 'net-next'.
Signed-off-by: David S. Miller <davem@davemloft.net >
2017-10-22 13:39:14 +01:00
2017-09-27 21:42:14 -04:00
2017-08-10 19:36:51 -04:00
2017-08-25 17:21:10 -04:00
2017-08-10 19:40:50 -04:00
2017-09-14 21:02:03 -04:00
2017-08-07 14:04:01 -04:00
2017-08-25 17:21:10 -04:00
2017-09-07 12:12:43 -07:00
2017-07-26 21:51:25 -04:00
2017-09-07 12:12:43 -07:00
2017-09-07 12:12:43 -07:00
2017-08-25 18:24:04 -04:00
2017-06-26 12:44:35 -04:00
2017-06-20 12:18:27 +02:00
2017-08-24 22:28:52 -04:00
2017-08-25 17:29:29 -04:00
2017-08-25 17:21:10 -04:00
2017-08-25 17:21:10 -04:00
2017-08-25 17:42:42 -04:00
2017-10-02 22:49:27 -04:00
2017-08-25 17:21:10 -04:00
2017-10-06 14:58:22 -04:00
2017-08-29 21:51:45 -04:00
2017-09-30 12:50:56 -07:00
2017-09-07 12:12:43 -07:00
2017-08-29 21:51:45 -04:00
2017-08-25 17:21:10 -04:00
2017-06-27 12:13:21 -06:00
2017-08-25 17:21:11 -04:00
2017-08-25 17:21:10 -04:00
2017-09-07 12:12:43 -07:00
2017-10-19 12:46:43 +01:00
2017-10-17 15:54:41 -04:00
2017-04-26 18:34:34 -04:00
2017-08-29 21:51:44 -04:00
2017-07-01 17:13:56 -04:00
2017-09-08 18:26:48 -07:00
2017-08-24 22:29:45 -04:00
2016-12-24 11:46:01 -08:00
2016-12-14 15:25:12 -05:00
2016-12-24 11:46:01 -08:00
2016-12-14 15:25:12 -05:00
2016-12-24 11:46:01 -08:00
2016-12-14 15:25:12 -05:00
2017-08-25 17:21:11 -04:00
2016-07-13 22:33:23 -04:00
2015-08-07 15:03:42 +02:00
2017-08-25 17:21:10 -04:00
2017-08-25 17:21:10 -04:00
2014-10-20 16:21:33 +02:00
2017-04-04 19:39:39 -04:00
2017-08-25 17:21:11 -04:00
2017-08-24 22:29:07 -04:00
2015-04-09 18:08:31 -07:00
2015-05-31 18:06:28 -07:00
2015-05-31 18:06:28 -07:00
2015-04-17 10:13:56 -07:00
2017-08-25 17:21:11 -04:00
2015-11-25 22:08:55 -05:00
2015-11-25 22:08:52 -05:00
2017-04-21 10:31:33 -04:00
2017-04-21 10:31:33 -04:00
2014-10-20 16:21:33 +02:00
2017-08-24 22:29:06 -04:00
2016-08-16 00:49:32 -04:00
2015-02-02 09:57:46 -08:00
2017-08-25 17:21:11 -04:00
2017-08-10 19:55:35 -04:00
2014-07-17 22:07:37 +02:00
2016-05-10 22:01:07 -04:00
2017-08-25 17:21:12 -04:00
2017-08-10 19:55:35 -04:00
2017-08-10 19:55:34 -04:00
2017-08-25 17:21:10 -04:00
2017-08-25 17:21:10 -04:00
2015-11-09 16:32:14 -08:00
2017-08-25 17:21:11 -04:00
2017-08-07 14:04:02 -04:00
2013-04-09 14:13:16 -04:00
2017-08-07 14:04:01 -04:00
2013-04-09 14:13:16 -04:00
2017-08-25 17:21:10 -04:00
2017-09-05 08:18:42 -04:00
2017-06-12 20:48:00 -04:00
2017-08-29 21:51:44 -04:00
2017-08-24 22:28:55 -04:00
2017-08-25 17:21:10 -04:00
2015-08-12 13:14:57 -07:00
2017-08-25 17:21:11 -04:00
2015-11-20 11:39:03 -05:00
2017-08-22 22:23:36 -04:00
2017-08-08 11:49:51 -04:00
2017-06-20 12:18:27 +02:00
2017-06-20 12:18:27 +02:00
2016-05-16 11:14:29 -04:00
2017-08-25 17:08:08 -04:00
2016-01-27 20:36:10 +08:00
2014-10-20 16:21:33 +02:00
2017-09-13 10:47:14 -07:00
2017-08-22 16:34:36 +02:00
2016-01-27 20:36:10 +08:00
2017-10-11 13:32:35 -04:00
2017-08-07 14:04:02 -04:00
2017-08-10 19:55:34 -04:00
2017-08-25 17:21:11 -04:00
2017-04-26 15:09:04 -06:00
2017-08-07 14:04:01 -04:00
2014-03-27 08:26:31 -07:00
2016-02-05 16:29:28 -06:00
2014-10-20 16:21:33 +02:00
2017-08-25 17:21:10 -04:00
2017-04-24 18:16:49 -04:00
2013-04-15 14:30:44 -06:00
2014-11-24 14:45:27 +01:00
2014-07-17 22:07:35 +02:00
2015-05-31 18:06:28 -07:00
2017-08-25 17:21:11 -04:00
2017-01-31 21:37:44 -05:00
2013-01-03 15:57:01 -08:00
2017-09-01 11:59:17 +02:00
2017-08-25 17:21:11 -04:00
2017-08-24 22:29:01 -04:00
2017-08-24 22:29:05 -04:00
2017-08-07 14:04:01 -04:00
2017-08-25 17:21:11 -04:00
2015-05-31 18:06:28 -07:00
2017-05-16 08:44:21 -03:00
2017-08-25 17:21:11 -04:00
2017-08-25 17:21:11 -04:00
2017-08-25 17:21:11 -04:00
2017-08-28 22:15:46 -04:00
2016-11-28 15:51:31 -05:00
2017-02-22 19:33:00 -05:00
2017-09-08 18:26:48 -07:00
2017-08-31 23:09:11 -04:00
2017-04-26 15:09:04 -06:00
2016-12-07 18:13:52 -05:00
2017-02-22 18:41:42 -05:00
2017-09-27 21:55:21 -04:00
2017-08-25 17:08:07 -04:00
2017-08-31 23:09:49 -04:00
2015-02-04 08:00:24 -08:00
2014-11-12 11:16:05 +01:00
2017-04-13 13:58:20 -04:00
2016-02-19 10:52:45 -05:00
2017-08-25 17:08:07 -04:00
2016-12-24 11:46:01 -08:00
2016-03-14 21:05:04 -04:00
2017-10-02 22:16:18 -04:00
2014-06-06 16:08:16 -07:00
2017-10-06 14:48:55 -04:00
2016-04-11 16:57:09 -04:00
2017-10-11 14:33:12 -04:00
2017-10-02 22:23:21 -04:00
2017-08-29 21:51:45 -04:00
2017-02-23 16:57:19 -05:00
2017-08-25 17:08:08 -04:00
2017-09-07 12:12:43 -07:00
2017-05-16 08:44:15 -03:00
2016-09-15 09:51:14 -04:00
2017-08-16 20:01:31 -04:00
2017-10-02 22:16:25 -04:00
2017-06-29 10:21:15 -04:00
2016-04-11 16:57:09 -04:00
2017-09-07 12:12:43 -07:00
2017-09-15 15:16:49 -04:00
2017-08-25 17:21:10 -04:00
2016-02-23 21:27:02 -05:00
2017-03-15 19:27:46 -04:00
2017-02-23 16:57:19 -05:00
2014-07-17 22:07:39 +02:00
2017-08-25 17:08:08 -04:00
2014-11-12 11:15:57 +01:00
2017-08-08 11:49:51 -04:00
2015-11-18 11:59:09 -05:00
2017-04-26 18:32:29 -04:00
2017-08-30 21:53:13 -04:00
2014-05-28 12:16:28 +02:00
2017-08-25 17:21:11 -04:00
2015-08-10 23:07:05 -04:00
2017-06-27 21:46:55 -04:00
2015-05-31 18:06:28 -07:00
2017-08-24 22:28:51 -04:00
2017-03-06 22:27:33 -05:00
2017-01-11 22:31:03 -05:00
2017-08-25 17:21:10 -04:00
2013-04-09 14:13:15 -04:00
2016-09-01 17:52:01 -07:00
2015-05-31 18:06:28 -07:00
2017-06-12 21:02:04 -04:00
2017-08-22 16:34:36 +02:00
2013-11-26 11:09:07 +01:00
f8ddadc4db