* linux-next: manual merge of the scsi-mkp tree with the kbuild tree
@ 2021-01-25 4:02 Stephen Rothwell
2021-01-28 5:56 ` Stephen Rothwell
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2021-01-25 4:02 UTC (permalink / raw)
To: Martin K. Petersen, Masahiro Yamada
Cc: Hannes Reinecke, Linux Kernel Mailing List,
Linux Next Mailing List, Sasha Levin
[-- Attachment #1: Type: text/plain, Size: 725 bytes --]
Hi all,
Today's linux-next merge of the scsi-mkp tree got a conflict in:
drivers/scsi/gdth.c
between commit:
537896fabed1 ("kbuild: give the SUBLEVEL more room in KERNEL_VERSION")
from the kbuild tree and commit:
0653c358d2dc ("scsi: Drop gdth driver")
from the scsi-mkp tree.
I fixed it up (I deleted 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 scsi-mkp tree with the kbuild tree
2021-01-25 4:02 linux-next: manual merge of the scsi-mkp tree with the kbuild tree Stephen Rothwell
@ 2021-01-28 5:56 ` Stephen Rothwell
2021-02-14 21:59 ` linux-next: manual merge of the scsi " Stephen Rothwell
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2021-01-28 5:56 UTC (permalink / raw)
To: Masahiro Yamada, James Bottomley
Cc: Martin K. Petersen, Hannes Reinecke, Linux Kernel Mailing List,
Linux Next Mailing List, Sasha Levin
[-- Attachment #1: Type: text/plain, Size: 920 bytes --]
Hi all,
On Mon, 25 Jan 2021 15:02:13 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the scsi-mkp tree got a conflict in:
>
> drivers/scsi/gdth.c
>
> between commit:
>
> 537896fabed1 ("kbuild: give the SUBLEVEL more room in KERNEL_VERSION")
>
> from the kbuild tree and commit:
>
> 0653c358d2dc ("scsi: Drop gdth driver")
>
> from the scsi-mkp tree.
>
> I fixed it up (I deleted 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 scsi tree and the kbuild tree.
--
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 scsi tree with the kbuild tree
2021-01-28 5:56 ` Stephen Rothwell
@ 2021-02-14 21:59 ` Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2021-02-14 21:59 UTC (permalink / raw)
To: Masahiro Yamada, James Bottomley
Cc: Martin K. Petersen, Hannes Reinecke, Linux Kernel Mailing List,
Linux Next Mailing List, Sasha Levin
[-- Attachment #1: Type: text/plain, Size: 1150 bytes --]
Hi all,
On Thu, 28 Jan 2021 16:56:11 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> On Mon, 25 Jan 2021 15:02:13 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
> >
> > Today's linux-next merge of the scsi-mkp tree got a conflict in:
> >
> > drivers/scsi/gdth.c
> >
> > between commit:
> >
> > 537896fabed1 ("kbuild: give the SUBLEVEL more room in KERNEL_VERSION")
> >
> > from the kbuild tree and commit:
> >
> > 0653c358d2dc ("scsi: Drop gdth driver")
> >
> > from the scsi-mkp tree.
> >
> > I fixed it up (I deleted 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 scsi tree and the kbuild tree.
With the merge window about to open, this is a reminder that this
conflict still exists.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-02-14 22:00 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-01-25 4:02 linux-next: manual merge of the scsi-mkp tree with the kbuild tree Stephen Rothwell
2021-01-28 5:56 ` Stephen Rothwell
2021-02-14 21:59 ` linux-next: manual merge of the scsi " Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox