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