public inbox for linux-acpi@vger.kernel.org
 help / color / mirror / Atom feed
From: "Rafael J. Wysocki" <rjw@sisk.pl>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, LKML <linux-kernel@vger.kernel.org>,
	ACPI Devel Maling List <linux-acpi@vger.kernel.org>,
	Len Brown <lenb@kernel.org>
Subject: Re: linux-next: first tree
Date: Thu, 14 Feb 2008 15:45:55 +0100	[thread overview]
Message-ID: <200802141545.56488.rjw@sisk.pl> (raw)
In-Reply-To: <20080215003537.8911ce35.sfr@canb.auug.org.au>

On Thursday, 14 of February 2008, Stephen Rothwell wrote:
> Hi all,
> 
> I have created the first cut of the linux-next tree at
> git://git.kernel.org/pub/scm/linux/kernel/git/sfr/linux-next.git.
> 
> Things to know about this tree:
> 
> It has two branches - master and stable.  Stable is currently just Linus'
> tree and will never rebase.  Master will rebase on an almost daily basis
> (maybe slower at the start).
> 
> The tree consists of subsystem git and quilt trees.  Currently, the quilt
> trees are integrated by importing them into appropriately based git
> branches and then merging those branches.  This has the advantage that
> any conflict resolution will onlt have to happen once at the merge point
> rather than, possibly, sevveral times during the series.  However, I am
> considering just applying the quilt trees on top of the current tree
> to get a result more like Linus' tree - we will see. The git trees are
> obviously just merged.
> 
> Between each merge, the tree was built with both an allmodconfig for both
> powerpc and x86_64.
> 
> The tree currently contains:
> 	Greg's driver-core, pci and usb quilt series (in that order)
> 	Alasdair Kergon's device-mapper quilt tree
> 	Jiri Kosina's hid git tree
> 	Jean Delvare's i2c quilt tree
> 	Randy Dunlap's kernel-doc quilt tree
> 	Haavard Skinnemoen's avr32 git tree
> 
> There was only one unresolved conflict which could have been caused
> because I was not sure where to base the kernel-doc tree.
> 
> So, comments, please.
> 
> Also, more trees please ... :-)

Perhaps you can add:

git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 test

Thanks,
Rafael

       reply	other threads:[~2008-02-14 14:47 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <20080215003537.8911ce35.sfr@canb.auug.org.au>
2008-02-14 14:45 ` Rafael J. Wysocki [this message]
2008-02-14 15:00   ` linux-next: first tree Stephen Rothwell
2008-02-14 15:25     ` Martin Schwidefsky
2008-02-14 21:48       ` Stephen Rothwell
2008-02-14 15:49     ` Paul Mundt
2008-02-14 21:58       ` Stephen Rothwell
2008-02-15  4:58     ` Len Brown
2008-02-15  6:19       ` 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=200802141545.56488.rjw@sisk.pl \
    --to=rjw@sisk.pl \
    --cc=lenb@kernel.org \
    --cc=linux-acpi@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --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