Skip to content

Commit 917ad8a

Browse files
committed
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
2 parents 0a06917 + 062191a commit 917ad8a

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

Documentation/admin-guide/thunderbolt.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,7 @@ is built-in to the kernel image, there is no need to do anything.
370370

371371
The driver will create one virtual ethernet interface per Thunderbolt
372372
port which are named like ``thunderbolt0`` and so on. From this point
373-
you can either use standard userspace tools like ``ifconfig`` to
373+
you can either use standard userspace tools like ``ip`` to
374374
configure the interface or let your GUI handle it automatically.
375375

376376
Forcing power

drivers/thunderbolt/path.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -586,7 +586,7 @@ int tb_path_activate(struct tb_path *path)
586586
tb_dbg(path->tb, "%s path activation complete\n", path->name);
587587
return 0;
588588
err:
589-
tb_WARN(path->tb, "%s path activation failed\n", path->name);
589+
tb_warn(path->tb, "%s path activation failed: %d\n", path->name, res);
590590
return res;
591591
}
592592

0 commit comments

Comments
 (0)