Re: linux-next: manual merge of the scsi tree with Linus' tree
From: James Bottomley
Date: Thu Jan 23 2014 - 21:22:48 EST
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".
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/