From: David Miller <davem@davemloft.net>
To: sfr@canb.auug.org.au
Cc: airlied@linux.ie, linux-next@vger.kernel.org,
linux-kernel@vger.kernel.org, ben@decadent.org.uk,
divy@chelsio.com
Subject: Re: linux-next: manual merge of the drm tree with the net tree
Date: Sun, 30 Aug 2009 21:29:18 -0700 (PDT) [thread overview]
Message-ID: <20090830.212918.146621489.davem@davemloft.net> (raw)
In-Reply-To: <20090831142105.7c05ae77.sfr@canb.auug.org.au>
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 31 Aug 2009 14:21:05 +1000
> Hi Dave,
>
> Today's linux-next merge of the drm tree got a conflict in
> firmware/Makefile between commit 2e8c07c35b3ffee7689406be61fd1448ee45d3cd
> ("cxgb3: use request_firmware() for the EDC registers setup") from the
> net tree and commit ece2be7993cc5e269cbf0cad6442b401a2c31915 ("drm/mga:
> Use request_firmware() to load microcode") from the drm tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.
This looks fine, please carry the fix until we all merge this stuff
in during the merge window :-)
prev parent reply other threads:[~2009-08-31 4:29 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-08-31 4:21 linux-next: manual merge of the drm tree with the net tree Stephen Rothwell
2009-08-31 4:29 ` David Miller [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=20090830.212918.146621489.davem@davemloft.net \
--to=davem@davemloft.net \
--cc=airlied@linux.ie \
--cc=ben@decadent.org.uk \
--cc=divy@chelsio.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