* linux-next: manual merge of the scsi-post-merge tree @ 2008-10-16 8:41 Stephen Rothwell 2008-10-16 13:56 ` James Bottomley 0 siblings, 1 reply; 3+ messages in thread From: Stephen Rothwell @ 2008-10-16 8:41 UTC (permalink / raw) To: James Bottomley; +Cc: linux-next [-- Attachment #1: Type: text/plain, Size: 245 bytes --] Hi James, I attempted to merge this tree, but it appears that it already applied or even updated. So I have dropped it for today. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --] ^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the scsi-post-merge tree 2008-10-16 8:41 linux-next: manual merge of the scsi-post-merge tree Stephen Rothwell @ 2008-10-16 13:56 ` James Bottomley 2008-10-16 23:38 ` Stephen Rothwell 0 siblings, 1 reply; 3+ messages in thread From: James Bottomley @ 2008-10-16 13:56 UTC (permalink / raw) To: Stephen Rothwell; +Cc: linux-next On Thu, 2008-10-16 at 19:41 +1100, Stephen Rothwell wrote: > I attempted to merge this tree, but it appears that it already applied or > even updated. So I have dropped it for today. Yes, sorry; now all the precursors are upstream I moved its contents to scsi-misc. I'll clean the tree out and make merge base equal to head so it won't cause trouble until it's needed again. James ^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the scsi-post-merge tree 2008-10-16 13:56 ` James Bottomley @ 2008-10-16 23:38 ` Stephen Rothwell 0 siblings, 0 replies; 3+ messages in thread From: Stephen Rothwell @ 2008-10-16 23:38 UTC (permalink / raw) To: James Bottomley; +Cc: linux-next [-- Attachment #1: Type: text/plain, Size: 444 bytes --] Hi James, On Thu, 16 Oct 2008 08:56:24 -0500 James Bottomley <James.Bottomley@HansenPartnership.com> wrote: > > Yes, sorry; now all the precursors are upstream I moved its contents to > scsi-misc. I'll clean the tree out and make merge base equal to head so > it won't cause trouble until it's needed again. Great, thanks. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --] ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2008-10-16 23:38 UTC | newest] Thread overview: 3+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2008-10-16 8:41 linux-next: manual merge of the scsi-post-merge tree Stephen Rothwell 2008-10-16 13:56 ` James Bottomley 2008-10-16 23:38 ` Stephen Rothwell
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox