diff options
| author | Ingo Molnar <mingo@kernel.org> | 2024-01-02 10:41:38 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2024-01-02 10:41:38 +0100 |
| commit | 67a1723344cfe05430977483d6d3c7a999480143 (patch) | |
| tree | f27e4398049f485c3fa44322e4f3ddde10796f8c /include/linux/mdio.h | |
| parent | a51749ab34d9e5dec548fe38ede7e01e8bb26454 (diff) | |
| parent | 610a9b8f49fbcf1100716370d3b5f6f884a2835a (diff) | |
| download | lwn-67a1723344cfe05430977483d6d3c7a999480143.tar.gz lwn-67a1723344cfe05430977483d6d3c7a999480143.zip | |
Merge tag 'v6.7-rc8' into locking/core, to pick up dependent changes
Pick up these commits from Linus's tree:
b106bcf0f99a ("locking/osq_lock: Clarify osq_wait_next()")
563adbfc351b ("locking/osq_lock: Clarify osq_wait_next() calling convention")
7c2230982129 ("locking/osq_lock: Move the definition of optimistic_spin_node into osq_lock.c")
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/mdio.h')
| -rw-r--r-- | include/linux/mdio.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/mdio.h b/include/linux/mdio.h index 8fa23bdcedbf..007fd9c3e4b6 100644 --- a/include/linux/mdio.h +++ b/include/linux/mdio.h @@ -420,7 +420,7 @@ static inline u32 linkmode_adv_to_mii_t1_adv_m_t(unsigned long *advertising) * A function that translates value of following registers to the linkmode: * IEEE 802.3-2018 45.2.3.10 "EEE control and capability 1" register (3.20) * IEEE 802.3-2018 45.2.7.13 "EEE advertisement 1" register (7.60) - * IEEE 802.3-2018 45.2.7.14 "EEE "link partner ability 1 register (7.61) + * IEEE 802.3-2018 45.2.7.14 "EEE link partner ability 1" register (7.61) */ static inline void mii_eee_cap1_mod_linkmode_t(unsigned long *adv, u32 val) { |