* linux-next: manual merge of the printk tree with the asm-generic tree
@ 2018-03-15 0:45 Stephen Rothwell
2018-03-15 7:50 ` Sergey Senozhatsky
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2018-03-15 0:45 UTC (permalink / raw)
To: Petr Mladek, Arnd Bergmann
Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Sergey Senozhatsky
[-- Attachment #1: Type: text/plain, Size: 753 bytes --]
Hi Petr,
Today's linux-next merge of the printk tree got a conflict in:
arch/blackfin/kernel/dumpstack.c
between commit:
e7e57f690e38 ("arch: remove blackfin port")
from the asm-generic tree and commit:
33251b634b4a ("dump_stack: convert generic dump_stack into a weak symbol")
from the printk tree.
I fixed it up (I just removed the file) 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] 3+ messages in thread
* Re: linux-next: manual merge of the printk tree with the asm-generic tree
2018-03-15 0:45 linux-next: manual merge of the printk tree with the asm-generic tree Stephen Rothwell
@ 2018-03-15 7:50 ` Sergey Senozhatsky
2018-03-15 12:52 ` Petr Mladek
0 siblings, 1 reply; 3+ messages in thread
From: Sergey Senozhatsky @ 2018-03-15 7:50 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Petr Mladek, Arnd Bergmann, Linux-Next Mailing List,
Linux Kernel Mailing List, Sergey Senozhatsky
On (03/15/18 11:45), Stephen Rothwell wrote:
> Hi Petr,
>
> Today's linux-next merge of the printk tree got a conflict in:
>
> arch/blackfin/kernel/dumpstack.c
>
> between commit:
>
> e7e57f690e38 ("arch: remove blackfin port")
>
> from the asm-generic tree and commit:
>
> 33251b634b4a ("dump_stack: convert generic dump_stack into a weak symbol")
>
> from the printk tree.
If blackfin is gone and nds32 was fixed then we can drop my patch.
-ss
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the printk tree with the asm-generic tree
2018-03-15 7:50 ` Sergey Senozhatsky
@ 2018-03-15 12:52 ` Petr Mladek
0 siblings, 0 replies; 3+ messages in thread
From: Petr Mladek @ 2018-03-15 12:52 UTC (permalink / raw)
To: Sergey Senozhatsky
Cc: Stephen Rothwell, Arnd Bergmann, Linux-Next Mailing List,
Linux Kernel Mailing List
On Thu 2018-03-15 16:50:06, Sergey Senozhatsky wrote:
> On (03/15/18 11:45), Stephen Rothwell wrote:
> > Hi Petr,
> >
> > Today's linux-next merge of the printk tree got a conflict in:
> >
> > arch/blackfin/kernel/dumpstack.c
> >
> > between commit:
> >
> > e7e57f690e38 ("arch: remove blackfin port")
> >
> > from the asm-generic tree and commit:
> >
> > 33251b634b4a ("dump_stack: convert generic dump_stack into a weak symbol")
> >
> > from the printk tree.
>
> If blackfin is gone and nds32 was fixed then we can drop my patch.
I have just dropped the patch.
Thanks,
Petr
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-03-15 12:52 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-03-15 0:45 linux-next: manual merge of the printk tree with the asm-generic tree Stephen Rothwell
2018-03-15 7:50 ` Sergey Senozhatsky
2018-03-15 12:52 ` Petr Mladek
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).