From mboxrd@z Thu Jan 1 00:00:00 1970 From: James Bottomley Subject: SCSI git tree splitting into scsi-misc-2.6 and scsi-post-merge-2.6 Date: Fri, 05 Sep 2008 11:34:03 -0500 Message-ID: <1220632443.3331.19.camel@localhost.localdomain> References: <20080905161212.e3612601.sfr@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain Content-Transfer-Encoding: 7bit Return-path: Received: from accolon.hansenpartnership.com ([76.243.235.52]:36810 "EHLO accolon.hansenpartnership.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751731AbYIEQeG (ORCPT ); Fri, 5 Sep 2008 12:34:06 -0400 In-Reply-To: <20080905161212.e3612601.sfr@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org List-ID: To: Stephen Rothwell Cc: Jens Axboe , linux-next@vger.kernel.org, David Woodhouse , Mike Christie , linux-scsi Due to conflicts with block#for-2.6.28 I'm splitting the tree to resolve them. The two trees are now git.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-post-merge-2.6.git git.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6.git scsi-misc-2.6 will keep things that have no external dependencies, so will be merged very early in the merge window. scsi-post-merge-2.6 will keep the other tree dependent pieces, and so won't be able to go until after the other trees have gone in. Since the trees will evolve semi-independently, you'll need to pull both in to get all the changes. Instructions for linux-next: You need to include the scsi-post-merge-2.6 tree last (or at least after all its component trees) and only the pieces from merge-base..master (that will insulate you from rebasing effects). James