From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Kamil Rytarowski <n54@gmx.com>
Cc: Jonathan Corbet <corbet@lwn.net>,
Masahiro Yamada <yamada.masahiro@socionext.com>,
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 jc_docs tree with the kbuild tree
Date: Tue, 4 Jul 2017 04:33:00 +1000 [thread overview]
Message-ID: <20170704043247.52e889ba@canb.auug.org.au> (raw)
In-Reply-To: <054dc72a-39ce-ee8c-62d1-c17f487009de@gmx.com>
Hi Kamil,
On Mon, 3 Jul 2017 18:43:32 +0200 Kamil Rytarowski <n54@gmx.com> wrote:
>
> Am I expected to do it myself and resend a new patch?
No, this conflict is not very hard to fix up, so Linus just needs to be
told it exists as a courtesy.
--
Cheers,
Stephen Rothwell
next prev parent reply other threads:[~2017-07-03 18:33 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-26 1:13 linux-next: manual merge of the jc_docs tree with the kbuild tree Stephen Rothwell
2017-07-03 2:58 ` Stephen Rothwell
2017-07-03 16:43 ` Kamil Rytarowski
2017-07-03 18:13 ` Jonathan Corbet
2017-07-03 18:33 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-03-11 1:07 Stephen Rothwell
2026-01-26 16:41 Mark
2026-01-26 22:55 ` Nathan Chancellor
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=20170704043247.52e889ba@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=corbet@lwn.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=n54@gmx.com \
--cc=yamada.masahiro@socionext.com \
/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