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,
	"Stephen M.Cameron" <scameron@beardog.cce.hp.com>
Subject: Re: linux-next: manual merge of the scsi tree with Linus' tree
Date: Thu, 23 Jan 2014 18:22:42 -0800	[thread overview]
Message-ID: <1390530162.15909.14.camel@dabdike.int.hansenpartnership.com> (raw)
In-Reply-To: <20140124130547.323ce38edc8dedfd653534b7@canb.auug.org.au>

On Fri, 2014-01-24 at 13:05 +1100, Stephen Rothwell wrote:
> Hi James,
> 
> Today's linux-next merge of the scsi tree got conflicts in
> drivers/scsi/hpsa.c and drivers/scsi/hpsa.h between commits from Linus'
> tree and commits from the scsi tree.
> 
> This has happened because what you submitted to Linus differed
> significantly to what is in the scsi tree in linux-next.  :-(
> 
> I have just dropped the scsi tree for now.

Hm, sorry about that.  It looks like there was a failed push of the
for-next branch five weeks ago when I rebased to drop a pm80xx commit.
This also caused it to be six commits behind (five hpsa and one ipr)
because they were added after the rebase.

Not sure what else to do except "will try harder in future".

James

       reply	other threads:[~2014-01-24  2:22 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <20140124130547.323ce38edc8dedfd653534b7@canb.auug.org.au>
2014-01-24  2:22 ` James Bottomley [this message]
2019-05-22  0:11 linux-next: manual merge of the scsi tree with Linus' tree Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
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-01-24  3:58 Stephen Rothwell
2019-01-14  2:48 Stephen Rothwell
2019-01-14  5:42 ` 黃清隆
2017-11-06  3:48 Stephen Rothwell
2012-07-20  0:32 Stephen Rothwell
2012-07-20  7:29 ` James Bottomley
2012-07-20 16:31   ` Linus Torvalds

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=1390530162.15909.14.camel@dabdike.int.hansenpartnership.com \
    --to=james.bottomley@hansenpartnership.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=scameron@beardog.cce.hp.com \
    --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 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).