From: Mark Brown <broonie@kernel.org>
To: Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
"H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>,
Tomi Valkeinen <tomi.valkeinen@ti.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: linux-next: manual merge of the tip tree with the tree
Date: Tue, 11 Mar 2014 19:03:46 +0000 [thread overview]
Message-ID: <20140311190346.89aa11208f24e6abd10721b1@kernel.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 405 bytes --]
Hi all,
Today's linux-next merge of the tip tree got a conflict in drivers/video/fbdev/sgivwfb.c between commit 844901baede6b5 ("video: move fbdev to drivers/video/fbdev") from the omap2_dss tree and commit c5f9ee3d665a76 ("x86, platforms: Remove SGI Visual Workstation") from the tip tree.
I fixed it up by deleting the offending driver and can carry the fix as necessary (no action is required).
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2014-03-11 19:04 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-11 19:03 Mark Brown [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-08-18 4:14 linux-next: manual merge of the tip tree with the tree Stephen Rothwell
2011-05-31 0:19 Stephen Rothwell
2011-05-13 3:10 Stephen Rothwell
2011-05-13 8:03 ` Ralf Baechle
2009-08-17 6:50 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=20140311190346.89aa11208f24e6abd10721b1@kernel.org \
--to=broonie@kernel.org \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
--cc=tomi.valkeinen@ti.com \
/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