aleph/lkl_linux
1
0
Fork 0
mirror of https://github.com/lkl/linux.git synced 2025-12-19 16:13:19 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge 5.13-rc4 into usb-next

Browse Source 
We need the usb/thunderbolt fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman
2021-05-31 09:50:26 +02:00
parent 7652dd2c5c 8124c8a6b3
commit aa10fab0f8
780 changed files with 8872 additions and 3964 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/linux/device.h
View File

@@ -591,7 +591,7 @@ struct device {
* @flags: Link flags.
* @rpm_active: Whether or not the consumer device is runtime-PM-active.
* @kref: Count repeated addition of the same link.
* @rcu_head: An RCU head to use for deferred execution of SRCU callbacks.
* @rm_work: Work structure used for removing the link.
* @supplier_preactivated: Supplier has been made active before consumer probe.
*/
struct device_link {
@@ -604,9 +604,7 @@ struct device_link {
u32 flags;
refcount_t rpm_active;
struct kref kref;
#ifdef CONFIG_SRCU
struct rcu_head rcu_head;
#endif
struct work_struct rm_work;
bool supplier_preactivated; /* Owned by consumer probe. */
};