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

Hi all, On Mon, 25 Jan 2021 15:02:13 +1100 Stephen Rothwell 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

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

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