linux-kernel - Re: linux-next: build failure after merge of the device-mapper tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:   Tue, 27 Mar 2018 08:39:09 -0700
From:   Bart Van Assche <bart.vanassche@....com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>,
        Alasdair G Kergon <agk@...hat.com>,
        Mike Snitzer <snitzer@...hat.com>, Jens Axboe <axboe@...nel.dk>
Cc:     Linux-Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Denis Semakin <d.semakin@...russia.ru>
Subject: Re: linux-next: build failure after merge of the device-mapper tree

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.