Linux-Next Archive on
 help / color / Atom feed
From: "Martin K. Petersen" <>
To: Stephen Rothwell <>
Cc: James Bottomley <>,
	"Paul E. McKenney" <>,
	Linux Next Mailing List <>,
	Linux Kernel Mailing List <>,
	Ryan Attard <>,
	"Martin K. Petersen" <>
Subject: Re: linux-next: manual merge of the scsi tree with the rcu tree
Date: Tue, 29 Oct 2019 21:19:12 -0400
Message-ID: <> (raw)
In-Reply-To: <> (Stephen Rothwell's message of "Tue, 29 Oct 2019 15:08:26 +1100")


> 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

  parent reply index

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-10-29  4:08 Stephen Rothwell
2019-10-29 10:08 ` Paul E. McKenney
2019-10-30  1:19 ` Martin K. Petersen [this message]
     [not found] ` <>
2019-11-02 13:45   ` Paul E. McKenney

Reply instructions:

You may reply publically 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:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \ \ \ \ \ \ \ \ \

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Linux-Next Archive on

Archives are clonable:
	git clone --mirror linux-next/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-next linux-next/ \
	public-inbox-index linux-next

Example config snippet for mirrors

Newsgroup available over NNTP:

AGPL code for this site: git clone