* linux-next: manual merge of the akpm-current tree with the scsi tree
@ 2018-06-20 3:54 Stephen Rothwell
2018-06-29 5:16 ` Stephen Rothwell
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2018-06-20 3:54 UTC (permalink / raw)
To: Andrew Morton, James Bottomley
Cc: Linux-Next Mailing List, Linux Kernel Mailing List,
Sebastian Andrzej Siewior, Matthew Wilcox, Martin K. Petersen
[-- Attachment #1: Type: text/plain, Size: 808 bytes --]
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
lib/percpu_ida.c
between commit:
acf3ff616ee2 ("scsi: Remove percpu_ida")
from the scsi tree and commit:
0c4d6e08c775 ("lib/percpu_ida.c: don't do alloc from per-CPU list if there is none")
from the akpm-current tree.
I fixed it up (I just removed the file, but clearly the akpm-current
tree commit could be removed) 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 scsi tree
2018-06-20 3:54 linux-next: manual merge of the akpm-current tree with the scsi tree Stephen Rothwell
@ 2018-06-29 5:16 ` Stephen Rothwell
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2018-06-29 5:16 UTC (permalink / raw)
To: Andrew Morton, James Bottomley
Cc: Linux-Next Mailing List, Linux Kernel Mailing List,
Sebastian Andrzej Siewior, Matthew Wilcox, Martin K. Petersen
[-- Attachment #1: Type: text/plain, Size: 1001 bytes --]
Hi all,
On Wed, 20 Jun 2018 13:54:58 +1000 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the akpm-current tree got a conflict in:
>
> lib/percpu_ida.c
>
> between commit:
>
> acf3ff616ee2 ("scsi: Remove percpu_ida")
>
> from the scsi tree and commit:
>
> 0c4d6e08c775 ("lib/percpu_ida.c: don't do alloc from per-CPU list if there is none")
>
> from the akpm-current tree.
>
> I fixed it up (I just removed the file, but clearly the akpm-current
> tree commit could be removed) 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 Linus' tree and the scsi 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-29 5:16 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-06-20 3:54 linux-next: manual merge of the akpm-current tree with the scsi tree Stephen Rothwell
2018-06-29 5:16 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox