diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-12-10 09:22:34 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-12-10 09:22:34 +0100 |
| commit | c4aa8b2a8b63a269d63acafc0358a7b9f5d9e563 (patch) | |
| tree | d04a7861e542665bb7c03aac729a72c957be8abc /net/ipv4/udp_offload.c | |
| parent | Merge tag 'soundwire-4.21-rc1' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff) | |
| parent | Linux 4.20-rc6 (diff) | |
| download | linux-c4aa8b2a8b63a269d63acafc0358a7b9f5d9e563.tar.xz linux-c4aa8b2a8b63a269d63acafc0358a7b9f5d9e563.zip | |
Merge 4.20-rc6 into char-misc-next
This should resolve the hv driver merge conflict.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/ipv4/udp_offload.c')
0 files changed, 0 insertions, 0 deletions