Commit 917ad8a6 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'thunderbolt-for-v6.20-rc1' of... 

Merge tag 'thunderbolt-for-v6.20-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt into usb-next

Mika writes:

thunderbolt: Changes for v6.20 merge window

This includes following USB4/Thunderbolt changes for the v6.20 merge
window:

  - Tiny documentation update
  - Switch to use tb_warn() when logging path activation failures.

Both have been in linux-next with no reported issues.

* tag 'thunderbolt-for-v6.20-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt:
  thunderbolt: Log path activation failures without WARN backtraces
  docs: admin-guide: thunderbolt: Replace ifconfig with ip
parents 0a069174 062191ad

Documentation/admin-guide/thunderbolt.rst

+1 −1
Original line number Diff line number Diff line
@@ -370,7 +370,7 @@ is built-in to the kernel image, there is no need to do anything. 


The driver will create one virtual ethernet interface per Thunderbolt

port which are named like ``thunderbolt0`` and so on. From this point

you can either use standard userspace tools like ``ifconfig`` to

you can either use standard userspace tools like ``ip`` to

configure the interface or let your GUI handle it automatically.



Forcing power

drivers/thunderbolt/path.c

+1 −1
Original line number Diff line number Diff line
@@ -586,7 +586,7 @@ int tb_path_activate(struct tb_path *path) 
	tb_dbg(path->tb, "%s path activation complete\n", path->name);

	return 0;

err:

	tb_WARN(path->tb, "%s path activation failed\n", path->name);

	tb_warn(path->tb, "%s path activation failed: %d\n", path->name, res);

	return res;

}