From: Stephen Rothwell <sfr@canb•auug.org.au>
To: "Martin K. Petersen" <martin.petersen@oracle•com>,
Masahiro Yamada <masahiroy@kernel•org>
Cc: Hannes Reinecke <hare@suse•de>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Sasha Levin <sashal@kernel•org>
Subject: linux-next: manual merge of the scsi-mkp tree with the kbuild tree
Date: Mon, 25 Jan 2021 15:02:13 +1100 [thread overview]
Message-ID: <20210125150213.2b09c92e@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 725 bytes --]
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.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2021-01-25 4:03 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-25 4:02 Stephen Rothwell [this message]
2021-01-28 5:56 ` linux-next: manual merge of the scsi-mkp tree with the kbuild tree Stephen Rothwell
2021-02-14 21:59 ` linux-next: manual merge of the scsi " 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=20210125150213.2b09c92e@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=hare@suse$(echo .)de \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=martin.petersen@oracle$(echo .)com \
--cc=masahiroy@kernel$(echo .)org \
--cc=sashal@kernel$(echo .)org \
/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