* linux-next: manual merge of the akpm-current tree with the csky tree
@ 2020-02-17 1:22 Stephen Rothwell
2020-02-17 2:44 ` Masahiro Yamada
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2020-02-17 1:22 UTC (permalink / raw)
To: Andrew Morton, Guo Ren
Cc: Linux Next Mailing List, Linux Kernel Mailing List, MaJun,
Masahiro Yamada
[-- Attachment #1: Type: text/plain, Size: 759 bytes --]
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
arch/csky/include/asm/Kbuild
between commit:
aeb58bb21421 ("csky: Add PCI support")
from the csky tree and commit:
25e6e2bca62a ("asm-generic: make more kernel-space headers mandatory")
from the akpm-current tree.
I fixed it up (the latter is a superset of the former) 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 akpm-current tree with the csky tree
2020-02-17 1:22 linux-next: manual merge of the akpm-current tree with the csky tree Stephen Rothwell
@ 2020-02-17 2:44 ` Masahiro Yamada
0 siblings, 0 replies; 2+ messages in thread
From: Masahiro Yamada @ 2020-02-17 2:44 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Andrew Morton, Guo Ren, Linux Next Mailing List,
Linux Kernel Mailing List, MaJun
Hi Stephen,
On Mon, Feb 17, 2020 at 10:22 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> Today's linux-next merge of the akpm-current tree got a conflict in:
>
> arch/csky/include/asm/Kbuild
>
> between commit:
>
> aeb58bb21421 ("csky: Add PCI support")
>
> from the csky tree and commit:
>
> 25e6e2bca62a ("asm-generic: make more kernel-space headers mandatory")
>
> from the akpm-current tree.
>
> I fixed it up (the latter is a superset of the former) and can carry the
> fix as necessary.
Correct. The latter is a superset.
Andrew sends rebased patches to Linus,
so it should be probably fine.
Thanks.
> 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
--
Best Regards
Masahiro Yamada
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-02-17 3:03 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-02-17 1:22 linux-next: manual merge of the akpm-current tree with the csky tree Stephen Rothwell
2020-02-17 2:44 ` Masahiro Yamada
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).