From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Greg KH <greg@kroah•com>, Jonathan Corbet <corbet@lwn•net>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Mauro Carvalho Chehab <mchehab@s-opensource•com>,
Jiri Slaby <jslaby@suse•cz>
Subject: linux-next: manual merge of the tty tree with the jc_docs tree
Date: Tue, 8 Nov 2016 16:30:13 +1100 [thread overview]
Message-ID: <20161108163013.24d165f3@canb.auug.org.au> (raw)
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.
--
Cheers,
Stephen Rothwell
next reply other threads:[~2016-11-08 5:30 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-08 5:30 Stephen Rothwell [this message]
2016-11-08 10:15 ` linux-next: manual merge of the tty tree with the jc_docs tree Greg KH
2016-11-08 18:40 ` Jiri Slaby
2016-11-08 19:55 ` 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=20161108163013.24d165f3@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=corbet@lwn$(echo .)net \
--cc=greg@kroah$(echo .)com \
--cc=jslaby@suse$(echo .)cz \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mchehab@s-opensource$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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