From: Greg KH <greg@kroah.com>
To: Jiri Slaby <jslaby@suse.cz>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
Jonathan Corbet <corbet@lwn.net>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Mauro Carvalho Chehab <mchehab@s-opensource.com>
Subject: Re: linux-next: manual merge of the tty tree with the jc_docs tree
Date: Tue, 8 Nov 2016 20:55:26 +0100 [thread overview]
Message-ID: <20161108195526.GA30597@kroah.com> (raw)
In-Reply-To: <8b7599f2-6933-9636-7326-6c7fd08ddb16@suse.cz>
On Tue, Nov 08, 2016 at 07:40:53PM +0100, Jiri Slaby wrote:
> On 11/08/2016, 11:15 AM, Greg KH wrote:
> > On Tue, Nov 08, 2016 at 04:30:13PM +1100, Stephen Rothwell wrote:
> >> Hi Greg,
> >>
> >> Today's linux-next merge of the tty tree got a conflict in:
> >>
> >> Documentation/VGA-softcursor.txt
> >>
> >> between commits:
> >>
> >> 27641b953c54 ("Documentation/VGA-softcursor.txt: convert to ReST markup")
> >> 9d85025b0418 ("docs-rst: create an user's manual book")
> >>
> >> from the jc_docs tree and commit:
> >>
> >> b9c8b7fc252c ("vgacon: remove prehistoric macros")
> >>
> >> from the tty tree.
> >>
> >> I fixed it up (I deleted it - since 9d85025b0418 moved it - but that
> >> means it may need fixing up in its new location to match any relevant
> >> changes in b9c8b7fc252c) 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.
> >
> > Thanks, I'll work on sending a documentation patch after 4.10-rc1 to fix
> > this up.
>
> I have the change in my tree already:
> https://git.kernel.org/cgit/linux/kernel/git/jirislaby/linux.git/commit/?h=devel&id=c4321f11b3ea88fc1c756a087869c09e89f2d299
>
> If you want me to send that as a separate patch (or any other action),
> please let me know.
Can you send it to the documentation tree so it doesn't get lost?
thanks for doing this,
greg k-h
prev parent reply other threads:[~2016-11-08 19:55 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-08 5:30 linux-next: manual merge of the tty tree with the jc_docs tree Stephen Rothwell
2016-11-08 10:15 ` Greg KH
2016-11-08 18:40 ` Jiri Slaby
2016-11-08 19:55 ` Greg KH [this message]
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=20161108195526.GA30597@kroah.com \
--to=greg@kroah.com \
--cc=corbet@lwn.net \
--cc=jslaby@suse.cz \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mchehab@s-opensource.com \
--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).