From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, LKML <linux-kernel@vger.kernel.org>
Subject: Re: linux-next: Tree for Dec 12
Date: Mon, 12 Dec 2011 16:26:04 -0500 [thread overview]
Message-ID: <20111212212604.GA11844@phenom.dumpdata.com> (raw)
In-Reply-To: <20111212161444.22a11535656c6bfbd884d9ec@canb.auug.org.au>
On Mon, Dec 12, 2011 at 04:14:44PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Changes since 20111209:
>
> New tree: remoteproc
>
> Removed tree: arm-lpae (its job is done)
>
> The drm tree gained a conflict against Linus' tree.
Using wholesale the drm tree for the rivers/gpu/drm/nouveau/nouveau_sgdma.c
is the right approach. I tried to create a patch to send to you for it (by
merging drm-next against Linus' tree and running mergetool) - but I don't seem
to get anything out of it (just some fix to the Intel driver).
next prev parent reply other threads:[~2011-12-12 21:27 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-12 5:14 linux-next: Tree for Dec 12 Stephen Rothwell
2011-12-12 17:32 ` linux-next: Tree for Dec 12 (staging/rtl8192e) Randy Dunlap
2011-12-14 4:39 ` Sean MacLennan
2011-12-15 1:18 ` [PATCH] " Sean MacLennan
2011-12-16 18:57 ` Randy Dunlap
2011-12-12 21:26 ` Konrad Rzeszutek Wilk [this message]
2013-12-12 6:06 linux-next: Tree for Dec 12 Stephen Rothwell
2014-12-12 7:35 Stephen Rothwell
2014-12-12 9:49 ` Paul Bolle
2014-12-12 10:04 ` Stephen Rothwell
2014-12-12 10:31 ` Paul Bolle
2014-12-12 21:57 ` Andrew Morton
2014-12-12 22:36 ` Paul Bolle
2014-12-12 22:56 ` Andrew Morton
2014-12-13 4:10 ` Stephen Rothwell
2016-12-12 6:39 Stephen Rothwell
2017-12-12 5:29 Stephen Rothwell
2018-12-12 6:32 Stephen Rothwell
2019-12-12 4:50 Stephen Rothwell
2023-12-12 3:32 Stephen Rothwell
2023-12-12 6:25 ` 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=20111212212604.GA11844@phenom.dumpdata.com \
--to=konrad.wilk@oracle.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;
as well as URLs for NNTP newsgroup(s).