From: Greg KH <greg@kroah.com>
To: Jiri Slaby <jslaby@suse.cz>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: linux-next: manual merge of the tty tree with Linus' tree
Date: Mon, 16 Mar 2020 08:46:11 +0100 [thread overview]
Message-ID: <20200316074611.GA3128046@kroah.com> (raw)
In-Reply-To: <b518b4d6-b959-525f-1425-cdcb1277958f@suse.cz>
On Mon, Mar 16, 2020 at 07:38:33AM +0100, Jiri Slaby wrote:
> 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 for fixing this up, now merged.
greg k-h
next prev parent reply other threads:[~2020-03-16 7:46 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-10 3:40 linux-next: manual merge of the tty tree with Linus' tree Stephen Rothwell
2020-03-10 9:04 ` Greg KH
2020-03-10 10:52 ` Jiri Slaby
2020-03-16 6:38 ` Jiri Slaby
2020-03-16 7:46 ` Greg KH [this message]
2020-03-16 6:34 ` Jiri Slaby
-- strict thread matches above, loose matches on Subject: below --
2016-05-20 2:31 Stephen Rothwell
2016-05-21 3:26 ` Greg KH
2014-05-05 5:41 Stephen Rothwell
2014-05-05 21:02 ` Greg KH
2013-01-21 3:46 Stephen Rothwell
2013-01-21 21:02 ` Greg KH
2013-01-25 20:57 ` Greg KH
2013-01-17 2:04 Stephen Rothwell
2013-01-18 0:41 ` Greg KH
2011-10-25 8:18 Stephen Rothwell
2011-10-25 10:03 ` Nicolas Ferre
2011-10-25 8:12 Stephen Rothwell
2011-10-25 12:02 ` Greg KH
2011-02-24 5:34 Stephen Rothwell
2011-02-24 19:39 ` Greg KH
2011-02-25 5:11 ` Stephen Rothwell
2011-02-25 5:48 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200316074611.GA3128046@kroah.com \
--to=greg@kroah.com \
--cc=jslaby@suse.cz \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).