From: Stephen Rothwell <sfr@canb.auug.org.au>
To: "Martin K. Petersen" <martin.petersen@oracle.com>,
Greg KH <greg@kroah.com>, Arnd Bergmann <arnd@arndb.de>
Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Bart Van Assche <Bart.VanAssche@sandisk.com>,
Logan Gunthorpe <logang@deltatee.com>
Subject: linux-next: manual merge of the scsi-mkp tree with the char-misc tree
Date: Fri, 7 Apr 2017 15:33:51 +1000 [thread overview]
Message-ID: <20170407153351.0ecafd59@canb.auug.org.au> (raw)
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
next reply other threads:[~2017-04-07 5:34 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-07 5:33 Stephen Rothwell [this message]
2017-04-07 15:49 ` linux-next: manual merge of the scsi-mkp tree with the char-misc tree Bart Van Assche
2017-04-07 19:29 ` Logan Gunthorpe
2017-04-07 19:50 ` Bart Van Assche
2017-04-20 13:31 ` Boaz Harrosh
2017-04-12 1:00 ` Martin K. Petersen
2017-04-12 17:44 ` Bart Van Assche
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170407153351.0ecafd59@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=Bart.VanAssche@sandisk.com \
--cc=arnd@arndb.de \
--cc=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=logang@deltatee.com \
--cc=martin.petersen@oracle.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).