From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>,
Florian Tobias Schandinat <FlorianSchandinat@gmx.de>,
Tomi Valkeinen <tomi.valkeinen@ti.com>,
linux-fbdev@vger.kernel.org
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Steffen Trumtrar <s.trumtrar@pengutronix.de>,
Dave Airlie <airlied@linux.ie>
Subject: linux-next: manual merge of the fbdev tree with the drm tree
Date: Mon, 17 Jun 2013 14:21:20 +1000 [thread overview]
Message-ID: <20130617142120.b42dafb967974d3906a43fc9@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1332 bytes --]
Hi all,
Today's linux-next merge of the fbdev tree got a conflict in
drivers/video/of_display_timing.c between commit f583662347c6 ("video:
display_timing: make parameter const") from the drm tree and commits
fcf7e6e5bd84 ("videomode: don't allocate mem in of_get_display_timing()")
and ffa3fd21de8a ("videomode: implement public of_get_display_timing()")
from the fbdev tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/video/of_display_timing.c
index 2894e03,9c0f17b..0000000
--- a/drivers/video/of_display_timing.c
+++ b/drivers/video/of_display_timing.c
@@@ -53,13 -53,12 +53,12 @@@ static int parse_timing_property(const
}
/**
- * of_get_display_timing - parse display_timing entry from device_node
+ * of_parse_display_timing - parse display_timing entry from device_node
* @np: device_node with the properties
**/
- static struct display_timing *of_get_display_timing(const struct device_node
- *np)
-static int of_parse_display_timing(struct device_node *np,
++static int of_parse_display_timing(const struct device_node *np,
+ struct display_timing *dt)
{
- struct display_timing *dt;
u32 val = 0;
int ret = 0;
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2013-06-17 4:21 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-17 4:21 Stephen Rothwell [this message]
2013-06-17 7:23 ` linux-next: manual merge of the fbdev tree with the drm tree Tomi Valkeinen
2022-10-04 2:27 Stephen Rothwell
2022-10-04 7:29 ` Helge Deller
2022-12-13 0:16 Stephen Rothwell
2022-12-13 11:10 ` Helge Deller
2023-06-20 1:38 Stephen Rothwell
2023-08-01 0:43 Stephen Rothwell
2023-12-13 0:56 Stephen Rothwell
2023-12-13 0:58 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=20130617142120.b42dafb967974d3906a43fc9@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=FlorianSchandinat@gmx.de \
--cc=airlied@linux.ie \
--cc=linux-fbdev@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=plagnioj@jcrosoft.com \
--cc=s.trumtrar@pengutronix.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;
as well as URLs for NNTP newsgroup(s).