Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Browse source

en_rx_am.c was deleted in 'net-next' but had a bug fixed in it in
'net'.

The esp{4,6}_offload.c conflicts were overlapping changes.
The 'out' label is removed so we just return ERR_PTR(-EINVAL)
directly.

Signed-off-by: David S. Miller <davem@davemloft.net>

...

This commit is contained in:

David S. Miller 2018-01-23 13:49:06 -05:00

parent f53d77e19b a84a8ab94e

commit 5ca114400d

68 changed files with 729 additions and 162 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

4

include/uapi/linux/kvm.h

View file