* linux-next: manual merge of the block tree with the kbuild tree
@ 2019-11-18 0:53 Stephen Rothwell
2019-11-26 20:31 ` Stephen Rothwell
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2019-11-18 0:53 UTC (permalink / raw)
To: Jens Axboe, Masahiro Yamada
Cc: Linux Next Mailing List, Linux Kernel Mailing List, Dmitrii Dolgov
[-- Attachment #1: Type: text/plain, Size: 713 bytes --]
Hi all,
Today's linux-next merge of the block tree got a conflict in:
include/Kbuild
between commit:
fcbb8461fd23 ("kbuild: remove header compile test")
from the kbuild tree and commit:
c826bd7a743f ("io_uring: add set of tracing events")
from the block 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] 2+ messages in thread
* Re: linux-next: manual merge of the block tree with the kbuild tree
2019-11-18 0:53 linux-next: manual merge of the block tree with the kbuild tree Stephen Rothwell
@ 2019-11-26 20:31 ` Stephen Rothwell
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2019-11-26 20:31 UTC (permalink / raw)
To: Jens Axboe, Masahiro Yamada
Cc: Linux Next Mailing List, Linux Kernel Mailing List, Dmitrii Dolgov
[-- Attachment #1: Type: text/plain, Size: 906 bytes --]
Hi all,
On Mon, 18 Nov 2019 11:53:09 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the block tree got a conflict in:
>
> include/Kbuild
>
> between commit:
>
> fcbb8461fd23 ("kbuild: remove header compile test")
>
> from the kbuild tree and commit:
>
> c826bd7a743f ("io_uring: add set of tracing events")
>
> from the block 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.
This is now a conflict between the kbuild 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:[~2019-11-26 20:31 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-11-18 0:53 linux-next: manual merge of the block tree with the kbuild tree Stephen Rothwell
2019-11-26 20:31 ` 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).