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