linux-kernel - Re: linux-next: manual merge of the tty tree with Linus' 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] [thread-next>] [day] [month] [year] [list]

Message-ID: <b518b4d6-b959-525f-1425-cdcb1277958f@suse.cz>
Date:   Mon, 16 Mar 2020 07:38:33 +0100
From:   Jiri Slaby <jslaby@...e.cz>
To:     Greg KH <greg@...ah.com>, Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>
Subject: Re: linux-next: manual merge of the tty tree with Linus' tree

On 10. 03. 20, 10:04, Greg KH wrote:
> On Tue, Mar 10, 2020 at 02:40:13PM +1100, Stephen Rothwell wrote:
>> Hi all,
>>
>> Today's linux-next merge of the tty tree got a conflict in:
>>
>>   drivers/tty/vt/selection.c
>>
>> between commits:
>>
>>   4b70dd57a15d ("vt: selection, push console lock down")
>>   e8c75a30a23c ("vt: selection, push sel_lock up")
>>
>> from Linus' tree and commits:
>>
>>   9256d09f1da1 ("vt: selection, create struct from console selection globals")
>>   bc80932cc25a ("vt: selection, indent switch-case properly")
>>
>> from the tty tree.
>>
>> I fixed it up (I think - see below) and can carry the fix as necessary.
>> This is now fixed as far as linux-next is concerned, but any non trivial
>> conflicts should be mentioned to your upstream maintainer when your tree
>> is submitted for merging.  You may also want to consider cooperating
>> with the maintainer of the conflicting tree to minimise any particularly
>> complex conflicts.
> 
> Thank you for this, I hadn't gotten to it yet.
> 
> Your merge looks the same as mine, and I've pushed out the merge
> resolution in my tree.

Ah, the two merges differ, actually.

Stepen's (cdc26c076ff):

-       if (sel_cons != vc_cons[fg_console].d) {
 -      mutex_lock(&vc_sel.lock);
+       if (vc_sel.cons != vc_cons[fg_console].d) {


Yours (cb05c6c82fb0):
 -      if (sel_cons != vc_cons[fg_console].d) {
 +      mutex_lock(&vc_sel.lock);
 +      if (vc_sel.cons != vc_cons[fg_console].d) {

> Jiri, can you double-check to verify that the merge is correct in my
> tree?

So this is now a tty tree problem. Will send a patch in a minute.

thanks,
-- 
js
suse labs