diff options
| author | David S. Miller <davem@davemloft.net> | 2019-06-17 19:48:13 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-06-17 20:20:36 -0700 |
| commit | 13091aa30535b719e269f20a7bc34002bf5afae5 (patch) | |
| tree | bd17956c3ce606a119fadbd43bfa1c0c10006984 /net/vmw_vsock/hyperv_transport.c | |
| parent | f97252a8c33f0e02f4ffbf61dc94cd38164007bc (diff) | |
| parent | 29f785ff76b65696800b75c3d8e0b58e603bb1d0 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Honestly all the conflicts were simple overlapping changes,
nothing really interesting to report.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/vmw_vsock/hyperv_transport.c')
| -rw-r--r-- | net/vmw_vsock/hyperv_transport.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/net/vmw_vsock/hyperv_transport.c b/net/vmw_vsock/hyperv_transport.c index 063073fd4952..153c5187ff7f 100644 --- a/net/vmw_vsock/hyperv_transport.c +++ b/net/vmw_vsock/hyperv_transport.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Hyper-V transport for vsock * @@ -6,16 +7,6 @@ * support in the VM by introducing the new vsock transport. * * Copyright (c) 2017, Microsoft Corporation. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms and conditions of the GNU General Public License, - * version 2, as published by the Free Software Foundation. - * - * This program is distributed in the hope it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * */ #include <linux/module.h> #include <linux/vmalloc.h> |