From: "Rafael J. Wysocki" <rjw@sisk•pl>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: linux-next@vger•kernel.org,
Andrew Morton <akpm@linux-foundation•org>,
Ingo Molnar <mingo@elte•hu>,
Jesse Barnes <jbarnes@virtuousgeek•org>
Subject: Re: New linux-next tree suspend-2.6
Date: Mon, 16 Mar 2009 23:13:43 +0100 [thread overview]
Message-ID: <200903162313.44285.rjw@sisk.pl> (raw)
In-Reply-To: <20090316131647.48d632fb.sfr@canb.auug.org.au>
On Monday 16 March 2009, Stephen Rothwell wrote:
> Hi Rafael,
Hi,
> On Sun, 15 Mar 2009 17:54:36 +0100 "Rafael J. Wysocki" <rjw@sisk•pl> wrote:
> >
> > Here's a new tree for linux-next:
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6.git linux-next
> >
> > It is based on the Linus' current tree, but I can rebase it on top of anything
> > else if that helps.
>
> Linus' tree is good as a base.
>
> > Unfortunately, it has two merge conflict that I'm not sure how to resolve.
>
> Thanks for the suggested resolutions.
>
> > The first one is with the linux-next branch of pci-2.6 and it may be resolved
> > by applying the appended patch on top of pci-2.6/linux-next before
> > merging suspend-2.6/linux-next.
>
> I notice that your resolution is to revert a patch from the pci tree. As
> an alternative, you could apply the pci tree patch to your tree (which is
> what I will effectively do today when I resolve the conflict).
>
> OK, its a bit late in the cycle to be adding stuff for 2.6.30, but I will
> add your tree from today and we will see how it goes.
Thanks!
It's late, because it's been discussed a lot recently, but the patches are
really important (and supported by Linus ;-)).
> What I tell everyone: all patches/commits in the tree/series must
> have been:
>
> posted to a relevant mailing list
> reviewed
> unit tested
> destined for the next merge window (or the current release)
>
> *before* they are included.
This applies to all of the patches currently in the suspend tree. :-)
> The linux-next tree is for integration testing and to lower the impact of
> conflicts between subsystems in the next merge window.
Sure.
Thanks,
Rafael
prev parent reply other threads:[~2009-03-16 22:13 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-15 16:54 New linux-next tree suspend-2.6 Rafael J. Wysocki
2009-03-16 2:16 ` Stephen Rothwell
2009-03-16 9:05 ` Stephen Rothwell
2009-03-16 22:16 ` Rafael J. Wysocki
2009-03-16 23:10 ` Stephen Rothwell
2009-03-16 22:13 ` Rafael J. Wysocki [this message]
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=200903162313.44285.rjw@sisk.pl \
--to=rjw@sisk$(echo .)pl \
--cc=akpm@linux-foundation$(echo .)org \
--cc=jbarnes@virtuousgeek$(echo .)org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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