lkml.org 
[lkml]   [2018]   [Mar]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: linux-next: build failure after merge of the device-mapper tree
From
Date
On 03/26/18 19:39, Stephen Rothwell wrote:
> diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
> index d5db9df7ea4b..0589a4da12bb 100644
> --- a/drivers/md/dm-table.c
> +++ b/drivers/md/dm-table.c
> @@ -1896,7 +1896,7 @@ void dm_table_set_restrictions(struct dm_table *t, struct request_queue *q,
> blk_queue_flag_set(QUEUE_FLAG_DISCARD, q);
>
> if (dm_table_supports_secure_erase(t))
> - queue_flag_set_unlocked(QUEUE_FLAG_SECERASE, q);
> + blk_queue_flag_set(QUEUE_FLAG_SECERASE, q);
>
> if (dm_table_supports_flush(t, (1UL << QUEUE_FLAG_WC))) {
> wc = true;
>

The above patch looks fine to me. Thank you Stephen for having resolved
this merge conflict.

Bart.

\
 
 \ /
  Last update: 2018-03-27 17:40    [W:0.044 / U:0.260 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site