• David S. Miller's avatar
    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · f8ddadc4
    David S. Miller authored
    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
    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: default avatarDavid S. Miller <davem@davemloft.net>
af_can.c 25.2 KB