Re: linux-next: manual merge of the jc_docs tree with the kbuild tree

From	Stephen Rothwell <sfr@canb.auug.org.au>
Newsgroups	linux.kernel
Subject	Re: linux-next: manual merge of the jc_docs tree with the kbuild tree
Date	2017-07-03 20:40 +0200
Message-ID	<tZeqm-5bb-21@gated-at.bofh.it> (permalink)
References	<tWqR3-43B-5@gated-at.bofh.it> <tYZKG-3fo-3@gated-at.bofh.it> <tZcHT-43W-13@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

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

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

Re: linux-next: manual merge of the jc_docs tree with the kbuild tree Kamil Rytarowski <n54@gmx.com> - 2017-07-03 18:50 +0200
  Re: linux-next: manual merge of the jc_docs tree with the kbuild  tree Jonathan Corbet <corbet@lwn.net> - 2017-07-03 20:20 +0200
  Re: linux-next: manual merge of the jc_docs tree with the kbuild  tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-07-03 20:40 +0200

csiph-web