Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 85d8d3b1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'hyperv-fixes-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux 

Pull Hyper-V fixes from Sasha Levin:

 - A few fixes for the userspace hyper-v tools from Adrian Vladu.

 - A fix for the hyper-v MAINTAINERs entry from Lan Tianyu.

 - Fix for SPDX license identifier in the userspace tools from Nishad
   Kamdar.

* tag 'hyperv-fixes-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux:
  MAINTAINERS: Fix Hyperv vIOMMU driver file name
  tools: hv: Use the correct style for SPDX License Identifier
  tools: hv: fix typos in toolchain
  tools: hv: fix KVP and VSS daemons exit code
  tools: hv: fixed Python pep8/flake8 warnings for lsvmbus
parents 05c52532 bafe1e79

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -7460,7 +7460,7 @@ F: drivers/net/hyperv/ 
F:	drivers/scsi/storvsc_drv.c

F:	drivers/uio/uio_hv_generic.c

F:	drivers/video/fbdev/hyperv_fb.c

F:	drivers/iommu/hyperv_iommu.c

F:	drivers/iommu/hyperv-iommu.c

F:	net/vmw_vsock/hyperv_transport.c

F:	include/clocksource/hyperv_timer.h

F:	include/linux/hyperv.h

drivers/hv/hv_trace.h

+1 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/* SPDX-License-Identifier: GPL-2.0 */



#undef TRACE_SYSTEM

#define TRACE_SYSTEM hyperv

tools/hv/hv_get_dhcp_info.sh

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
#	the script prints the string "Disabled" to stdout.

#

# Each Distro is expected to implement this script in a distro specific

# fashion. For instance on Distros that ship with Network Manager enabled,

# fashion. For instance, on Distros that ship with Network Manager enabled,

# this script can be based on the Network Manager APIs for retrieving DHCP

# information.

tools/hv/hv_kvp_daemon.c

+5 −3
Original line number Diff line number Diff line
@@ -1051,7 +1051,7 @@ static int parse_ip_val_buffer(char *in_buf, int *offset, 
	char *start;



	/*

	 * in_buf has sequence of characters that are seperated by

	 * in_buf has sequence of characters that are separated by

	 * the character ';'. The last sequence does not have the

	 * terminating ";" character.

	 */
@@ -1386,6 +1386,8 @@ int main(int argc, char *argv[]) 
			daemonize = 0;

			break;

		case 'h':

			print_usage(argv);

			exit(0);

		default:

			print_usage(argv);

			exit(EXIT_FAILURE);

tools/hv/hv_set_ifconfig.sh

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
# be used to configure the interface.

#

# Each Distro is expected to implement this script in a distro specific

# fashion. For instance on Distros that ship with Network Manager enabled,

# fashion. For instance, on Distros that ship with Network Manager enabled,

# this script can be based on the Network Manager APIs for configuring the

# interface.

#