* linux-next: manual merge of the nvdimm tree with the jc_docs tree
@ 2018-05-09 8:05 Stephen Rothwell
2018-06-05 1:20 ` Stephen Rothwell
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2018-05-09 8:05 UTC (permalink / raw)
To: Dan Williams, Jonathan Corbet
Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Mike Rapoport
[-- Attachment #1: Type: text/plain, Size: 783 bytes --]
Hi Dan,
Today's linux-next merge of the nvdimm tree got a conflict in:
mm/hmm.c
between commit:
ad56b738c5dd ("docs/vm: rename documentation files to .rst")
from the jc_docs tree and commit:
737b47a6db70 ("mm, dev_pagemap: introduce CONFIG_DEV_PAGEMAP_OPS")
from the nvdimm tree.
I fixed it up (the latter removed the comment modified by the former,
so I just 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.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the nvdimm tree with the jc_docs tree
2018-05-09 8:05 linux-next: manual merge of the nvdimm tree with the jc_docs tree Stephen Rothwell
@ 2018-06-05 1:20 ` Stephen Rothwell
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2018-06-05 1:20 UTC (permalink / raw)
To: Dan Williams
Cc: Jonathan Corbet, Linux-Next Mailing List,
Linux Kernel Mailing List, Mike Rapoport
[-- Attachment #1: Type: text/plain, Size: 977 bytes --]
Hi all,
On Wed, 9 May 2018 18:05:39 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the nvdimm tree got a conflict in:
>
> mm/hmm.c
>
> between commit:
>
> ad56b738c5dd ("docs/vm: rename documentation files to .rst")
>
> from the jc_docs tree and commit:
>
> 737b47a6db70 ("mm, dev_pagemap: introduce CONFIG_DEV_PAGEMAP_OPS")
>
> from the nvdimm tree.
>
> I fixed it up (the latter removed the comment modified by the former,
> so I just 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.
This is now a conflict between the nvdimm tree and Linus' tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-06-05 1:20 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-05-09 8:05 linux-next: manual merge of the nvdimm tree with the jc_docs tree Stephen Rothwell
2018-06-05 1:20 ` Stephen Rothwell
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).