Skip to contentSkip to conversation

linux-next: manual merge of the scsi-mkp tree with the kbuild tree

DISCUSSION Stephen Rothwell 1 participant 3 messages Jan 25, 2021 – Feb 14, 2021 Linux-next tree

lore
Share & tools
lore
#0 lore raw

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.

Signature · 2 lines
Cheers,
Stephen Rothwell
#1 lore raw

Hi all,

Quoted 13 lines · On Mon, 25 Jan 2021 15:02:13 +1100 Stephen Rothwell <[email protected]>…

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")

Quoted 8 lines

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.

Signature · 2 lines
Cheers,
Stephen Rothwell
#2 lore raw

Re: linux-next: manual merge of the scsi tree with the kbuild tree

Hi all,

Quoted 17 lines · On Thu, 28 Jan 2021 16:56:11 +1100 Stephen Rothwell <[email protected]>…
Quoted 15 lines · On Mon, 25 Jan 2021 15:02:13 +1100 Stephen Rothwell <[email protected]>…

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.

Quoted 8 lines
Quoted 6 lines

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.

Signature · 2 lines
Cheers,
Stephen Rothwell