From: Stephen Rothwell <sfr@canb•auug.org.au>
To: "Martin K. Petersen" <martin.petersen@oracle•com>,
James Bottomley <James.Bottomley@HansenPartnership•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org
Subject: linux-next: manual merge of the scsi-mkp tree with the scsi tree
Date: Wed, 9 Nov 2016 13:57:42 +1100 [thread overview]
Message-ID: <20161109135742.5b07f051@canb.auug.org.au> (raw)
Hi Martin,
Today's linux-next merge of the scsi-mkp tree got a conflict in:
drivers/scsi/ufs/ufs-qcom.c
Again this is caused by the rebase of the scsi-mkp tree (including
commits already in the scsi tree) followed by more changes to this file.
I fixed it up (I used the scsi-mkp tree version) 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:[~2016-11-09 2:57 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-09 2:57 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2018-01-25 22:39 linux-next: manual merge of the scsi-mkp tree with the scsi tree Stephen Rothwell
2018-01-25 23:18 ` James Bottomley
2023-04-03 6:40 Stephen Rothwell
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=20161109135742.5b07f051@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=James.Bottomley@HansenPartnership$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=martin.petersen@oracle$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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