From: Petr Mladek <pmladek@suse.com>
To: Jonathan Corbet <corbet@lwn.net>
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>,
Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com>,
"Tobin C. Harding" <me@tobin.cc>
Subject: Re: linux-next: manual merge of the jc_docs tree with the printk tree
Date: Fri, 22 Dec 2017 12:08:54 +0100 [thread overview]
Message-ID: <20171222110854.fdxehxx3dbxq7vep@pathway.suse.cz> (raw)
In-Reply-To: <20171222104530.70bef8ac@canb.auug.org.au>
Hi Jonathan,
On Fri 2017-12-22 10:45:30, Stephen Rothwell wrote:
> Hi Jonathan,
>
> Today's linux-next merge of the jc_docs tree got a conflict in:
>
> Documentation/core-api/printk-formats.rst
>
> between commit:
>
> d7c6075efa6c ("symbol lookup: introduce dereference_symbol_descriptor()")
>
> from the printk tree and commit:
>
> b3ed23213eab ("doc: convert printk-formats.txt to rst")
>
> from the jc_docs 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.
I guess that you have experience with these problems so you probably
know how to handle this the best way.
Anyway, the printk.git stuff is targeting kernel-4.16. I have no
problem to take the document conversion via printk.git tree.
We could do it also the other way. But note that the conflicting
change in printk.git is part of a patchset (8 patches).
Best Regards,
Petr
PS: I will stay out of computers next week, so I probably
won't be able to do anything about this until January 2, 2018.
prev parent reply other threads:[~2017-12-22 11:08 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-21 23:45 linux-next: manual merge of the jc_docs tree with the printk tree Stephen Rothwell
2017-12-22 11:08 ` Petr Mladek [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=20171222110854.fdxehxx3dbxq7vep@pathway.suse.cz \
--to=pmladek@suse.com \
--cc=corbet@lwn.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=me@tobin.cc \
--cc=sergey.senozhatsky.work@gmail.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).