From: "Martin K. Petersen" <martin.petersen@oracle.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: James Bottomley <James.Bottomley@HansenPartnership.com>,
"Paul E. McKenney" <paulmck@kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Ryan Attard <ryanattard@ryanattard.info>,
"Martin K. Petersen" <martin.petersen@oracle.com>
Subject: Re: linux-next: manual merge of the scsi tree with the rcu tree
Date: Tue, 29 Oct 2019 21:19:12 -0400 [thread overview]
Message-ID: <yq1pnif6ne7.fsf@oracle.com> (raw)
In-Reply-To: <20191029150826.38c26ef8@canb.auug.org.au> (Stephen Rothwell's message of "Tue, 29 Oct 2019 15:08:26 +1100")
Stephen,
> Today's linux-next merge of the scsi tree got a conflict in:
>
> drivers/scsi/scsi_sysfs.c
>
> between commit:
>
> 81db81f82993 ("drivers/scsi: Replace rcu_swap_protected() with rcu_replace()")
>
> from the rcu tree and commit:
>
> d188b0675b21 ("scsi: core: Add sysfs attributes for VPD pages 0h and 89h")
>
> from the scsi tree.
Yes, this was expected. Fix is fine, thanks!
--
Martin K. Petersen Oracle Linux Engineering
next prev parent reply other threads:[~2019-10-30 1:19 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-29 4:08 linux-next: manual merge of the scsi tree with the rcu tree Stephen Rothwell
2019-10-29 10:08 ` Paul E. McKenney
2019-10-30 1:19 ` Martin K. Petersen [this message]
[not found] ` <CAEXS_ixkUAPTz4=ta+=+YLrsnmrAcuG43bLNX11Dzffi4L-Upg@mail.gmail.com>
2019-11-02 13:45 ` Paul E. McKenney
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=yq1pnif6ne7.fsf@oracle.com \
--to=martin.petersen@oracle.com \
--cc=James.Bottomley@HansenPartnership.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=paulmck@kernel.org \
--cc=ryanattard@ryanattard.info \
--cc=sfr@canb.auug.org.au \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.