* linux-next: manual merge of the scsi-fixes tree with Linus' tree
@ 2019-11-05 21:22 Stephen Rothwell
2019-11-07 1:56 ` Martin K. Petersen
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2019-11-05 21:22 UTC (permalink / raw)
To: Martin K. Petersen
Cc: Linux Next Mailing List, Linux Kernel Mailing List,
Damien Le Moal, Chaitanya Kulkarni, Jens Axboe
[-- Attachment #1: Type: text/plain, Size: 846 bytes --]
Hi all,
Today's linux-next merge of the scsi-fixes tree got a conflict in:
drivers/scsi/sd_zbc.c
between commit:
d81e9d494354 ("scsi: implement REQ_OP_ZONE_RESET_ALL")
from Linus' tree and commit:
8437bb81853e ("scsi: sd_zbc: Fix sd_zbc_complete()")
from the scsi-fixes tree.
8437bb81853e claims to fix d81e9d494354, however the latter is not an
ancestor of the former ...
I fixed it up (I just used the scsi-fixes tree 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
[-- 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 scsi-fixes tree with Linus' tree
2019-11-05 21:22 linux-next: manual merge of the scsi-fixes tree with Linus' tree Stephen Rothwell
@ 2019-11-07 1:56 ` Martin K. Petersen
0 siblings, 0 replies; 2+ messages in thread
From: Martin K. Petersen @ 2019-11-07 1:56 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Martin K. Petersen, Linux Next Mailing List,
Linux Kernel Mailing List, Damien Le Moal, Chaitanya Kulkarni,
Jens Axboe
Stephen,
[Looks like this mail didn't go out last night]
> 8437bb81853e claims to fix d81e9d494354, however the latter is not an
> ancestor of the former ...
Should be fixed now. d81e9d494354 was part of a series that went through
Jens' tree post -rc1.
--
Martin K. Petersen Oracle Linux Engineering
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-11-07 1:56 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-11-05 21:22 linux-next: manual merge of the scsi-fixes tree with Linus' tree Stephen Rothwell
2019-11-07 1:56 ` Martin K. Petersen
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).