From: Jesse Barnes <jbarnes@virtuousgeek.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Bjorn Helgaas <bjorn.helgaas@hp.com>
Subject: Re: linux-next: manual merge of the pci tree with the pci-current tree
Date: Fri, 26 Mar 2010 09:03:20 -0700 [thread overview]
Message-ID: <20100326090320.0764979a@jbarnes-piketon> (raw)
In-Reply-To: <20100326134836.ebe45694.sfr@canb.auug.org.au>
On Fri, 26 Mar 2010 13:48:36 +1100
Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Jesse,
>
> On Thu, 25 Mar 2010 19:10:49 -0700 Jesse Barnes <jbarnes@virtuousgeek.org> wrote:
> >
> > Time to rebase my -next branch onto my for-linus branch again I guess.
>
> Any reason you wouldn't just merge your for-linus branch into your -next branch?
I don't like to end up with a bunch of merges, so I generally just
rebase my -next branch as necessary.
--
Jesse Barnes, Intel Open Source Technology Center
next prev parent reply other threads:[~2010-03-26 16:04 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-26 0:57 linux-next: manual merge of the pci tree with the pci-current tree Stephen Rothwell
2010-03-26 2:10 ` Jesse Barnes
2010-03-26 2:48 ` Stephen Rothwell
2010-03-26 16:03 ` Jesse Barnes [this message]
2010-03-26 14:43 ` Bjorn Helgaas
-- strict thread matches above, loose matches on Subject: below --
2026-01-05 0:55 Stephen Rothwell
2024-10-24 0:25 Stephen Rothwell
2024-10-24 6:56 ` Bartosz Golaszewski
2024-10-24 18:50 ` Bjorn Helgaas
2024-06-03 0:24 Stephen Rothwell
2018-08-01 0:42 Stephen Rothwell
2016-02-24 0:02 Stephen Rothwell
2014-03-12 13:00 Mark Brown
2009-02-06 2:50 Stephen Rothwell
2009-02-06 17:09 ` Jesse Barnes
2009-02-06 23:49 ` Rafael J. Wysocki
2009-02-07 0:07 ` 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=20100326090320.0764979a@jbarnes-piketon \
--to=jbarnes@virtuousgeek.org \
--cc=bjorn.helgaas@hp.com \
--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