Hi Martin,
Today's linux-next merge of the scsi-mkp tree got a conflict in:
drivers/scsi/osd/osd_uld.c
between commit:
ac1ddc584e98 ("scsi: utilize new cdev_device_add helper function")
from the char-misc tree and commit:
c02465fa13b6 ("scsi: osd_uld: Check scsi_device_get() return value")
from the scsi-mkp tree.
I am not sure how to resolve this, so I have just effectively recerted
the latter commit fo today. Better suggestions welcome.
I fixed it up 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
