From: Jeremy Fitzhardinge <jeremy@goop.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, LKML <linux-kernel@vger.kernel.org>,
Ben Dooks <ben-linux@fluff.org>,
Xen Devel <Xen-devel@lists.xensource.com>,
Sumit Semwal <sumit.semwal@linaro.org>,
Rob Lee <rob.lee@linaro.org>
Subject: Re: linux-next: clean up time
Date: Tue, 24 Apr 2012 15:01:46 -0700 [thread overview]
Message-ID: <4F9722CA.80403@goop.org> (raw)
In-Reply-To: <20120423164859.082b5c53b5d9bd9a524ec864@canb.auug.org.au>
On 04/22/2012 11:48 PM, Stephen Rothwell wrote:
> Hi all,
>
> On Mon, 2 Apr 2012 11:20:09 +1000 Stephen Rothwell
<sfr@canb.auug.org.au> wrote:
>>
>> Can people please clean up stuff in their trees that has been merged by
>> their upstream. This is especially useful where the upstream merged (or
>> applied) a slightly different version of their tree.
>
> There is still much cruft in the linux-next included trees ... The
> following trees appear empty (relative to Linus' tree) but cause conflicts:
>
> bjdooks-i2c
> xen
> dma-buf
> cpuidle-cons
Are you pulling from xen.git upstream/xen? I just updated it to be
current Linus master, so it shouldn't conflict any more.
Thanks,
J
next prev parent reply other threads:[~2012-04-24 22:01 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-02 1:20 linux-next: clean up time Stephen Rothwell
2012-04-23 6:48 ` Stephen Rothwell
2012-04-24 22:01 ` Jeremy Fitzhardinge [this message]
2012-04-25 0:00 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2013-05-13 1:44 Stephen Rothwell
2019-01-07 3:38 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=4F9722CA.80403@goop.org \
--to=jeremy@goop.org \
--cc=Xen-devel@lists.xensource.com \
--cc=ben-linux@fluff.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=rob.lee@linaro.org \
--cc=sfr@canb.auug.org.au \
--cc=sumit.semwal@linaro.org \
/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