From: "Martin K. Petersen" <martin.petersen@oracle.com>
To: Mark Brown <broonie@kernel.org>
Cc: "Martin K. Petersen" <martin.petersen@oracle.com>,
Chandrakanth Patil <chandrakanth.patil@broadcom.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
"Martin K. Petersen" <mkp@kernel.org>,
"Milan P. Gandhi" <mgandhi@redhat.com>,
Ranjan Kumar <ranjan.kumar@broadcom.com>
Subject: Re: linux-next: manual merge of the scsi-mkp tree with the origin tree
Date: Tue, 22 Sep 2026 22:44:02 -0400 [thread overview]
Message-ID: <yq1tsngr8kh.fsf@ca-mkp.ca.oracle.com> (raw)
In-Reply-To: <aqxI7qklaslOJL7Q@sirena.org.uk>
Mark,
> Today's linux-next merge of the scsi-mkp tree got a conflict in:
>
> drivers/scsi/mpi3mr/mpi3mr_transport.c
Should be resolved as well.
--
Martin K. Petersen
next prev parent reply other threads:[~2026-09-23 2:44 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-17 20:09 Mark Brown
2026-09-23 2:44 ` Martin K. Petersen [this message]
-- strict thread matches above, loose matches on Subject: below --
2026-09-17 19:39 Mark Brown
2026-09-18 5:12 ` Niklas Cassel
2026-09-23 2:43 ` Martin K. Petersen
2026-07-13 15:13 Mark Brown
2026-07-16 10:13 ` Uwe Kleine-König
2026-07-16 13:03 ` Mark Brown
2026-07-16 13:09 ` Martin K. Petersen
2026-07-16 13:20 ` Mark Brown
2026-03-30 19:58 Mark Brown
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=yq1tsngr8kh.fsf@ca-mkp.ca.oracle.com \
--to=martin.petersen@oracle.com \
--cc=broonie@kernel.org \
--cc=chandrakanth.patil@broadcom.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mgandhi@redhat.com \
--cc=mkp@kernel.org \
--cc=ranjan.kumar@broadcom.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
all inboxes | Powered by JetHome®