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-07-11 06:08:58 -04:00
2017-04-05 10:15:20 +02:00
2017-10-04 21:39:33 -07:00
2016-07-08 12:20:57 +02:00
2016-04-25 16:44:27 -04:00
2016-04-25 16:44:27 -04:00
2016-06-09 23:41:03 -07:00
2015-03-06 21:50:02 -05:00
2017-08-31 14:42:19 -07:00
2015-09-17 17:18:37 -07:00
2017-10-18 12:24:33 +01:00
2016-02-16 20:21:48 -05:00
2017-04-14 10:06:42 +02:00
2016-05-20 18:03:16 -04:00
2017-10-11 09:49:34 +02:00
2017-10-11 09:49:34 +02:00
2016-04-27 22:48:25 -04:00
2017-02-03 15:16:45 -05:00
2017-10-21 01:33:19 +01:00
2017-10-07 21:22:58 +01:00
2017-09-29 06:19:32 +01:00
2016-08-17 19:36:23 -04:00
2016-10-03 02:00:22 -04:00
2016-07-08 12:20:57 +02:00
2016-03-23 22:09:58 -04:00
2016-12-25 17:21:22 +01:00
2017-01-09 16:07:41 -05:00
2015-03-12 22:58:12 -04:00
2017-06-15 12:12:40 -04:00
2016-05-03 16:08:14 -04:00