Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1680491
| From | Kamil Rytarowski <n54@gmx.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | Re: linux-next: manual merge of the jc_docs tree with the kbuild tree |
| Date | 2017-07-03 18:50 +0200 |
| Message-ID | <tZcHT-43W-13@gated-at.bofh.it> (permalink) |
| References | <tWqR3-43B-5@gated-at.bofh.it> <tYZKG-3fo-3@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
[Multipart message — attachments visible in raw view] - view raw
Hello,
Am I expected to do it myself and resend a new patch?
On 03.07.2017 04:58, Stephen Rothwell wrote:
> Hi all,
>
> With the merge window opening, just a reminder that this conflict still
> exists.
>
> On Mon, 26 Jun 2017 11:13:31 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>
>> Today's linux-next merge of the jc_docs tree got a conflict in:
>>
>> scripts/kernel-doc-xml-ref
>>
>> between commit:
>>
>> cb77f0d623ff ("scripts: Switch to more portable Perl shebang")
>>
>> from the kbuild tree and commit:
>>
>> 52b3f239bb69 ("Docs: clean up some DocBook loose ends")
>>
>> from the jc_docs tree.
>>
>> I fixed it up (the latter removed the file, so I did that) 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.
>
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
linux-next: manual merge of the jc_docs tree with the kbuild tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-06-26 03: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 05:00 +0200
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