Re: linux-next: manual merge of the fbdev tree with the drm tree

All of lore.kernel.org
 help / color / mirror / Atom feed

From: Tomi Valkeinen <tomi.valkeinen@ti.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
	Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>,
	Dave Airlie <airlied@linux.ie>
Cc: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>,
	linux-fbdev@vger.kernel.org, linux-next@vger.kernel.org,
	linux-kernel@vger.kernel.org,
	Steffen Trumtrar <s.trumtrar@pengutronix.de>
Subject: Re: linux-next: manual merge of the fbdev tree with the drm tree
Date: Mon, 17 Jun 2013 07:23:01 +0000	[thread overview]
Message-ID: <51BEB955.1020809@ti.com> (raw)
In-Reply-To: <20130617142120.b42dafb967974d3906a43fc9@canb.auug.org.au>

[-- Attachment #1: Type: text/plain, Size: 748 bytes --]

Hi,

On 17/06/13 07:21, Stephen Rothwell wrote:
> 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).

Thanks, looks correct to me.

I guess it'd be better to merge videomode and display_timing stuff via a
single tree from this on. Being in drivers/video/, I suggest the fbdev tree.

 Tomi



[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 901 bytes --]

WARNING: multiple messages have this Message-ID (diff)

From: Tomi Valkeinen <tomi.valkeinen@ti.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
	Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>,
	Dave Airlie <airlied@linux.ie>
Cc: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>,
	linux-fbdev@vger.kernel.org, linux-next@vger.kernel.org,
	linux-kernel@vger.kernel.org,
	Steffen Trumtrar <s.trumtrar@pengutronix.de>
Subject: Re: linux-next: manual merge of the fbdev tree with the drm tree
Date: Mon, 17 Jun 2013 10:23:01 +0300	[thread overview]
Message-ID: <51BEB955.1020809@ti.com> (raw)
In-Reply-To: <20130617142120.b42dafb967974d3906a43fc9@canb.auug.org.au>

[-- Attachment #1: Type: text/plain, Size: 748 bytes --]

Hi,

On 17/06/13 07:21, Stephen Rothwell wrote:
> 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).

Thanks, looks correct to me.

I guess it'd be better to merge videomode and display_timing stuff via a
single tree from this on. Being in drivers/video/, I suggest the fbdev tree.

 Tomi



[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 901 bytes --]

WARNING: multiple messages have this Message-ID (diff)

From: Tomi Valkeinen <tomi.valkeinen@ti.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
	Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>,
	Dave Airlie <airlied@linux.ie>
Cc: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>,
	<linux-fbdev@vger.kernel.org>, <linux-next@vger.kernel.org>,
	<linux-kernel@vger.kernel.org>,
	Steffen Trumtrar <s.trumtrar@pengutronix.de>
Subject: Re: linux-next: manual merge of the fbdev tree with the drm tree
Date: Mon, 17 Jun 2013 10:23:01 +0300	[thread overview]
Message-ID: <51BEB955.1020809@ti.com> (raw)
In-Reply-To: <20130617142120.b42dafb967974d3906a43fc9@canb.auug.org.au>

[-- Attachment #1: Type: text/plain, Size: 748 bytes --]

Hi,

On 17/06/13 07:21, Stephen Rothwell wrote:
> 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).

Thanks, looks correct to me.

I guess it'd be better to merge videomode and display_timing stuff via a
single tree from this on. Being in drivers/video/, I suggest the fbdev tree.

 Tomi



[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 901 bytes --]

next prev parent reply	other threads:[~2013-06-17  7:23 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-06-17  4:21 linux-next: manual merge of the fbdev tree with the drm tree Stephen Rothwell
2013-06-17  4:21 ` Stephen Rothwell
2013-06-17  7:23 ` Tomi Valkeinen [this message]
2013-06-17  7:23   ` Tomi Valkeinen
2013-06-17  7:23   ` Tomi Valkeinen
  -- strict thread matches above, loose matches on Subject: below --
2022-10-04  2:27 Stephen Rothwell
2022-10-04  2:27 ` Stephen Rothwell
2022-10-04  7:29 ` Helge Deller
2022-10-04  7:29   ` Helge Deller
2022-12-13  0:16 Stephen Rothwell
2022-12-13  0:16 ` Stephen Rothwell
2022-12-13 11:10 ` Helge Deller
2022-12-13 11:10   ` Helge Deller
2023-06-20  1:38 Stephen Rothwell
2023-06-20  1:38 ` Stephen Rothwell
2023-08-01  0:43 Stephen Rothwell
2023-08-01  0:43 ` Stephen Rothwell
2023-12-13  0:56 Stephen Rothwell
2023-12-13  0:56 ` Stephen Rothwell
2023-12-13  0:58 Stephen Rothwell
2023-12-13  0:58 ` Stephen Rothwell
2026-01-05  2: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=51BEB955.1020809@ti.com \
    --to=tomi.valkeinen@ti.com \
    --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=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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.