Today's linux-next merge of the omap_dss2 tree got conflicts in
drivers/video/omap2/dss/hdmi4_core.[ch] caused by ef26958a (omapdss:
HDMI: Rename hdmi driver files to nicer names) interacting with a range
of commits from Ricardo Neri in the fbdev tree and possibly some other
stuff. git is
Hi Mark, Jean-Christophe,
On 10/10/13 20:50, Mark Brown wrote:
Today's linux-next merge of the omap_dss2 tree got conflicts in
drivers/video/omap2/dss/hdmi4_core.[ch] caused by ef26958a (omapdss:
HDMI: Rename hdmi driver files to nicer names) interacting with a range
of commits from Ricardo
Hi,
* Tomi Valkeinen tomi.valkei...@ti.com [110221 00:46]:
Tony, do you have such a semi-stable branch I could use as a base? Or
any other ideas?
I guess you already figured this out.. The omap-for-linus branch should
have immutable commits. So you can merge with the earliest commit that
Hi Stephen and Tony,
On Sun, 2011-02-20 at 21:16 -0600, Stephen Rothwell wrote:
Hi Tomi,
Today's linux-next merge of the omap_dss2 tree got a conflict in
arch/arm/mach-omap2/board-3430sdp.c between commits
e109f171e2f4128e867b3445c369c18830c73751 (omap3sdp: Fix regulator
mapping for
Hi Tomi,
Today's linux-next merge of the omap_dss2 tree got a conflict in
arch/arm/mach-omap2/board-3430sdp.c between commits
e109f171e2f4128e867b3445c369c18830c73751 (omap3sdp: Fix regulator
mapping for ads7846 TS controller) and
6b272c098f64f0451d2b19bb911d65c6cd11cfc7 (omap3sdp: clean
Hi Tomi,
Today's linux-next merge of the omap_dss2 tree got a conflict in
arch/arm/mach-omap2/board-am3517evm.c between commit
3dc3bad6f1b316d79d9d1d596a590b5097cb3dc4 (ARM: OMAP2: use early init
hook) from the omap tree and commit
603aa0662c26ad05c3ecf1b912f8bebf76dab73d (OMAP2, 3: DSS2: board
Hi Tomi,
Today's linux-next merge of the omap_dss2 tree got a conflict in
arch/arm/mach-omap2/omap_hwmod_2430_data.c between commit
1ae9e33689d1346f7f85845857639a923e0796e3 (OMAP2430: hwmod data: Add
McSPI) from the omap tree and commit
452e3eed4ee6eb8d61b290dad53d48508a3438d8 (OMAP2430: hwmod
Hi Tomi,
Today's linux-next merge of the omap_dss2 tree got a conflict in
arch/arm/mach-omap2/omap_hwmod_2420_data.c between commit
eb969b4f07175960fa0b325e6c9bd2093ab49645 (OMAP2420: hwmod data: Add
McSPI) from the omap tree and commit
e9ca66e751e89d2d5323d809ecb2b54f4e255d8d (OMAP2420: hwmod
On Fri, 2010-05-14 at 21:09 +0200, ext Tony Lindgren wrote:
* Tomi Valkeinen tomi.valkei...@nokia.com [100512 01:54]:
Hi,
On Mon, 2010-05-10 at 22:20 +0200, ext Tony Lindgren wrote:
* Stephen Rothwell s...@canb.auug.org.au [100506 22:05]:
Hi Tomi,
Today's linux-next merge
* Tomi Valkeinen tomi.valkei...@nokia.com [100512 01:54]:
Hi,
On Mon, 2010-05-10 at 22:20 +0200, ext Tony Lindgren wrote:
* Stephen Rothwell s...@canb.auug.org.au [100506 22:05]:
Hi Tomi,
Today's linux-next merge of the omap_dss2 tree got a conflict in
Hi,
On Mon, 2010-05-10 at 22:20 +0200, ext Tony Lindgren wrote:
* Stephen Rothwell s...@canb.auug.org.au [100506 22:05]:
Hi Tomi,
Today's linux-next merge of the omap_dss2 tree got a conflict in
arch/arm/mach-omap2/board-rx51-peripherals.c between commit
Hi Tomi,
Today's linux-next merge of the omap_dss2 tree got a conflict in
arch/arm/mach-omap2/board-rx51-peripherals.c between commit
e87da74e34ad151e6ae75ebb7a7bf447f02c0004 (omap: rx51: Add supplies for
the tlv320aic3x codec driver) from the omap tree and commit
On Tue, 2010-02-09 at 17:52 +0100, ext Tony Lindgren wrote:
* Tomi Valkeinen tomi.valkei...@nokia.com [100208 01:23]:
On Mon, 2010-02-08 at 07:25 +0100, ext Stephen Rothwell wrote:
Hi Tomi,
Today's linux-next merge of the omap_dss2 tree got a conflict in
...@vger.kernel.org;
Hiremath, Vaibhav; Tony Lindgren; linux-omap@vger.kernel.org
Subject: linux-next: manual merge of the omap_dss2 tree with the
omap tree
Hi Tomi,
Today's linux-next merge of the omap_dss2 tree got a conflict in
arch/arm/mach-omap2/board-am3517evm.c between commit
* Tomi Valkeinen tomi.valkei...@nokia.com [100208 01:23]:
On Mon, 2010-02-08 at 07:25 +0100, ext Stephen Rothwell wrote:
Hi Tomi,
Today's linux-next merge of the omap_dss2 tree got a conflict in
arch/arm/mach-omap2/board-am3517evm.c between commit
On Mon, 2010-02-08 at 07:25 +0100, ext Stephen Rothwell wrote:
Hi Tomi,
Today's linux-next merge of the omap_dss2 tree got a conflict in
arch/arm/mach-omap2/board-am3517evm.c between commit
13560d875d67c06239c82a6148c1b87075701fe9 (AM3517: Enable basic I2C
Support) from the omap tree and
Hi Tomi,
On Mon, 08 Feb 2010 11:29:06 +0200 Tomi Valkeinen tomi.valkei...@nokia.com
wrote:
P.S. Tomi, this omap_dss2 commit only has your Acked-by not Signed-off-by.
Hmm, do you mean there's something wrong with that, or jfyi? Aren't I,
as a subsys maintainer, supposed to ack the patches?
Hi,
On Mon, 2010-02-08 at 11:57 +0100, ext Stephen Rothwell wrote:
Hi Tomi,
On Mon, 08 Feb 2010 11:29:06 +0200 Tomi Valkeinen tomi.valkei...@nokia.com
wrote:
P.S. Tomi, this omap_dss2 commit only has your Acked-by not Signed-off-by.
Hmm, do you mean there's something wrong with
Hi Tomi,
Today's linux-next merge of the omap_dss2 tree got a conflict in
arch/arm/mach-omap2/board-am3517evm.c between commit
13560d875d67c06239c82a6148c1b87075701fe9 (AM3517: Enable basic I2C
Support) from the omap tree and commit
56a3d0235cd50d14d7bd4d45e55d192aa0e78cac (OMAP: AM3517: Enable
On Wed, 2010-02-03 at 18:12 +0100, ext Tony Lindgren wrote:
* Grazvydas Ignotas nota...@gmail.com [100203 04:27]:
hi,
On Wed, Feb 3, 2010 at 6:29 AM, Stephen Rothwell s...@canb.auug.org.au
wrote:
Hi Tomi,
Today's linux-next merge of the omap_dss2 tree got a conflict in
hi,
On Wed, Feb 3, 2010 at 6:29 AM, Stephen Rothwell s...@canb.auug.org.au wrote:
Hi Tomi,
Today's linux-next merge of the omap_dss2 tree got a conflict in
arch/arm/mach-omap2/board-omap3pandora.c between commit
f8b6f704105164eac7c043a48f79c4234e03e4b2 (omap: Rename hsmmc symbols to
reflect
* Grazvydas Ignotas nota...@gmail.com [100203 04:27]:
hi,
On Wed, Feb 3, 2010 at 6:29 AM, Stephen Rothwell s...@canb.auug.org.au
wrote:
Hi Tomi,
Today's linux-next merge of the omap_dss2 tree got a conflict in
arch/arm/mach-omap2/board-omap3pandora.c between commit
Hi Tomi,
Today's linux-next merge of the omap_dss2 tree got a conflict in
arch/arm/mach-omap2/board-omap3pandora.c between commit
f8b6f704105164eac7c043a48f79c4234e03e4b2 (omap: Rename hsmmc symbols to
reflect independence from twl4030) from the omap tree and commit
On Mon, 2009-11-16 at 19:34 +0100, ext Tony Lindgren wrote:
Tomi, please update your patch by leaving out the now unnecessary
TWL4030 and regulator sections. See also the updated version of
your patch attached.
Thanks, updated. Now I'm able to merge linux-omap/for-next and
dss/for-next without
Hi Tomi,
On Tue, 17 Nov 2009 12:00:31 +0200 Tomi Valkeinen tomi.valkei...@nokia.com
wrote:
On Mon, 2009-11-16 at 19:34 +0100, ext Tony Lindgren wrote:
Tomi, please update your patch by leaving out the now unnecessary
TWL4030 and regulator sections. See also the updated version of
your
On Mon, 2009-11-16 at 06:04 +0100, ext Stephen Rothwell wrote:
Hi Tomi,
Today's linux-next merge of the omap_dss2 tree got a conflict in
arch/arm/configs/omap_3430sdp_defconfig between the omap tree and the
omap_dss2 tree.
I just used the version from the omap tree as I can't figure out
* Tomi Valkeinen tomi.valkei...@nokia.com [091116 02:06]:
On Mon, 2009-11-16 at 06:04 +0100, ext Stephen Rothwell wrote:
Hi Tomi,
Today's linux-next merge of the omap_dss2 tree got a conflict in
arch/arm/configs/omap_3430sdp_defconfig between the omap tree and the
omap_dss2 tree.
On 16/11/09 05:04, Stephen Rothwell wrote:
Hi Tomi,
Today's linux-next merge of the omap_dss2 tree got a conflict in
arch/arm/configs/omap_3430sdp_defconfig between the omap tree and the
omap_dss2 tree.
I just used the version from the omap tree as I can't figure out anything
better,
28 matches
Mail list logo
