Merge 5.6-rc4 into android-mainline
Linux 5.6-rc4 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: I578d32be8e67dcc83c260e5e6bf63c493d40735d
This commit is contained in:
@@ -530,7 +530,7 @@ struct request_queue {
|
||||
unsigned int sg_reserved_size;
|
||||
int node;
|
||||
#ifdef CONFIG_BLK_DEV_IO_TRACE
|
||||
struct blk_trace *blk_trace;
|
||||
struct blk_trace __rcu *blk_trace;
|
||||
struct mutex blk_trace_mutex;
|
||||
#endif
|
||||
/*
|
||||
|
Reference in New Issue
Block a user