linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: James Bottomley <James.Bottomley@HansenPartnership.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Linus <torvalds@linux-foundation.org>
Subject: Re: linux-next: manual merge of the scsi tree with Linus' tree
Date: Fri, 20 Jul 2012 08:29:20 +0100	[thread overview]
Message-ID: <1342769360.2984.2.camel@dabdike.int.hansenpartnership.com> (raw)
In-Reply-To: <20120720103254.4a043ea94ef16992466a8b19@canb.auug.org.au>

On Fri, 2012-07-20 at 10:32 +1000, Stephen Rothwell wrote:
> Hi James,
> 
> Today's linux-next merge of the scsi tree got a conflict in
> drivers/scsi/scsi_wait_scan.c between commit eea03c20ae38 ("Make
> wait_for_device_probe() also do scsi_complete_async_scans()") from Linus'
> tree and commit 01444e1106cb ("[SCSI] Remove scsi_wait_scan module") from
> the scsi tree.
> 
> I just removed the file.

That won't quite work; there's a lot of nasty fallout ... I'll actually
have to rebase the misc and async branches to fix this.

By the way, Linus, the patch says:

    Cc: Dan Williams <dan.j.williams@gmail.com>
    Cc: Alan Stern <stern@rowland.harvard.edu>
    Cc: James Bottomley <jbottomley@parallels.com>
    Cc: Borislav Petkov <bp@amd64.org>
    Cc: linux-scsi <linux-scsi@vger.kernel.org>

But best I can tell it never went to either me or linux-scsi.

James

  reply	other threads:[~2012-07-20  7:29 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-07-20  0:32 linux-next: manual merge of the scsi tree with Linus' tree Stephen Rothwell
2012-07-20  7:29 ` James Bottomley [this message]
2012-07-20 16:31   ` Linus Torvalds
     [not found] <20140124130547.323ce38edc8dedfd653534b7@canb.auug.org.au>
2014-01-24  2:22 ` James Bottomley
2017-11-06  3:48 Stephen Rothwell
2019-01-14  2:48 Stephen Rothwell
2019-01-14  5:42 ` 黃清隆
2019-01-24  3:58 Stephen Rothwell
2019-05-22  0:08 Stephen Rothwell
2019-05-28  1:43 ` Stephen Rothwell
2019-06-20 23:59   ` Stephen Rothwell
2019-06-21  0:07     ` Linus Torvalds
2019-06-21  0:34       ` Martin K. Petersen
2019-06-21  0:35       ` James Bottomley
2019-06-21  0:47         ` Linus Torvalds
2019-06-21  1:14         ` Martin K. Petersen
2019-06-21  6:21           ` Greg Kroah-Hartman
2019-05-22  0:11 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=1342769360.2984.2.camel@dabdike.int.hansenpartnership.com \
    --to=james.bottomley@hansenpartnership.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    --cc=torvalds@linux-foundation.org \
    /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;
as well as URLs for NNTP newsgroup(s).