From: Tomi Valkeinen <tomi.valkeinen@ti.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Jingoo Han <jg1.han@samsung.com>,
Florian Tobias Schandinat <FlorianSchandinat@gmx.de>,
linux-fbdev@vger.kernel.org
Subject: Re: linux-next: manual merge of the omap_dss2 tree with the fbdev tree
Date: Mon, 23 Sep 2013 07:30:43 +0000 [thread overview]
Message-ID: <523FEE23.3010503@ti.com> (raw)
In-Reply-To: <20130923122856.0a3dbf72a44dfef1238d7a1c@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 711 bytes --]
Hi Stephen, Jean-Christophe,
On 23/09/13 05:28, Stephen Rothwell wrote:
> Hi Tomi,
>
> Today's linux-next merge of the omap_dss2 tree got a conflict in
> drivers/video/atmel_lcdfb.c between commits a17c2e7b704f ("video:
> atmel_lcdfb: fix platform data struct") and 5e8be022fb5b ("video:
> atmel_lcdfb: add device tree suport") from the fbdev tree and commit
> a5d58be0796a ("video: atmel_lcdfb: use dev_get_platdata()") from the
> omap_dss2 tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Jean-Christophe's tree seems to contain some old commits, never pushed
to mainline. Jean-Christophe, can you reset your for-next branch?
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>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Jingoo Han <jg1.han@samsung.com>,
Florian Tobias Schandinat <FlorianSchandinat@gmx.de>,
linux-fbdev@vger.kernel.org
Subject: Re: linux-next: manual merge of the omap_dss2 tree with the fbdev tree
Date: Mon, 23 Sep 2013 10:30:43 +0300 [thread overview]
Message-ID: <523FEE23.3010503@ti.com> (raw)
In-Reply-To: <20130923122856.0a3dbf72a44dfef1238d7a1c@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 711 bytes --]
Hi Stephen, Jean-Christophe,
On 23/09/13 05:28, Stephen Rothwell wrote:
> Hi Tomi,
>
> Today's linux-next merge of the omap_dss2 tree got a conflict in
> drivers/video/atmel_lcdfb.c between commits a17c2e7b704f ("video:
> atmel_lcdfb: fix platform data struct") and 5e8be022fb5b ("video:
> atmel_lcdfb: add device tree suport") from the fbdev tree and commit
> a5d58be0796a ("video: atmel_lcdfb: use dev_get_platdata()") from the
> omap_dss2 tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Jean-Christophe's tree seems to contain some old commits, never pushed
to mainline. Jean-Christophe, can you reset your for-next branch?
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>
Cc: <linux-next@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
Jingoo Han <jg1.han@samsung.com>,
Florian Tobias Schandinat <FlorianSchandinat@gmx.de>,
<linux-fbdev@vger.kernel.org>
Subject: Re: linux-next: manual merge of the omap_dss2 tree with the fbdev tree
Date: Mon, 23 Sep 2013 10:30:43 +0300 [thread overview]
Message-ID: <523FEE23.3010503@ti.com> (raw)
In-Reply-To: <20130923122856.0a3dbf72a44dfef1238d7a1c@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 711 bytes --]
Hi Stephen, Jean-Christophe,
On 23/09/13 05:28, Stephen Rothwell wrote:
> Hi Tomi,
>
> Today's linux-next merge of the omap_dss2 tree got a conflict in
> drivers/video/atmel_lcdfb.c between commits a17c2e7b704f ("video:
> atmel_lcdfb: fix platform data struct") and 5e8be022fb5b ("video:
> atmel_lcdfb: add device tree suport") from the fbdev tree and commit
> a5d58be0796a ("video: atmel_lcdfb: use dev_get_platdata()") from the
> omap_dss2 tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Jean-Christophe's tree seems to contain some old commits, never pushed
to mainline. Jean-Christophe, can you reset your for-next branch?
Tomi
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 901 bytes --]
next prev parent reply other threads:[~2013-09-23 7:30 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-23 2:28 linux-next: manual merge of the omap_dss2 tree with the fbdev tree Stephen Rothwell
2013-09-23 2:28 ` Stephen Rothwell
2013-09-23 7:30 ` Tomi Valkeinen [this message]
2013-09-23 7:30 ` Tomi Valkeinen
2013-09-23 7:30 ` Tomi Valkeinen
2013-09-27 5:49 ` Stephen Rothwell
2013-09-27 5:49 ` 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=523FEE23.3010503@ti.com \
--to=tomi.valkeinen@ti.com \
--cc=FlorianSchandinat@gmx.de \
--cc=jg1.han@samsung.com \
--cc=linux-fbdev@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=plagnioj@jcrosoft.com \
--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.