* linux-next: manual merge of the lightnvm tree with Linus' tree
@ 2016-11-22 3:59 Stephen Rothwell
2016-11-22 4:56 ` Jens Axboe
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2016-11-22 3:59 UTC (permalink / raw)
To: Matias Bjørling; +Cc: linux-next, linux-kernel, Jens Axboe
Hi Matias,
Today's linux-next merge of the lightnvm tree got a conflict in:
drivers/nvme/host/lightnvm.c
between commit:
409ae5a76e05 ("lightnvm: invalid offset calculation for lba_shift")
from Linus' tree and commit:
2db3cb58a3dd ("nvme: lightnvm: attach lightnvm sysfs to nvme block device")
from the lightnvm tree.
I fixed it up (I just used the latter version) 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
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: linux-next: manual merge of the lightnvm tree with Linus' tree
2016-11-22 3:59 linux-next: manual merge of the lightnvm tree with Linus' tree Stephen Rothwell
@ 2016-11-22 4:56 ` Jens Axboe
0 siblings, 0 replies; 2+ messages in thread
From: Jens Axboe @ 2016-11-22 4:56 UTC (permalink / raw)
To: Stephen Rothwell, Matias Bjørling; +Cc: linux-next, linux-kernel
On 11/21/2016 08:59 PM, Stephen Rothwell wrote:
> Hi Matias,
>
> Today's linux-next merge of the lightnvm tree got a conflict in:
>
> drivers/nvme/host/lightnvm.c
>
> between commit:
>
> 409ae5a76e05 ("lightnvm: invalid offset calculation for lba_shift")
>
> from Linus' tree and commit:
>
> 2db3cb58a3dd ("nvme: lightnvm: attach lightnvm sysfs to nvme block device")
>
> from the lightnvm tree.
>
> I fixed it up (I just used the latter version) 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.
Matias, you should base your branches on mine to avoid situations like
this. And additionally, submit them for inclusion if they are targeted
at 4.10 (and I'm thinking they are, if they are in linux-next).
--
Jens Axboe
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-11-22 4:56 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-11-22 3:59 linux-next: manual merge of the lightnvm tree with Linus' tree Stephen Rothwell
2016-11-22 4:56 ` Jens Axboe
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox