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>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Subject: Re: linux-next: manual merge of the omap_dss2 tree with Linus' tree
Date: Tue, 27 Nov 2012 13:24:56 +0200	[thread overview]
Message-ID: <50B4A308.2090601@ti.com> (raw)
In-Reply-To: <20121126162233.9e7d7a036f2cc4a168cd3b6c@canb.auug.org.au>

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

Hi,

On 2012-11-26 07:22, Stephen Rothwell wrote:
> Hi Tomi,
> 
> Today's linux-next merge of the omap_dss2 tree got a conflict in
> drivers/video/omap2/dss/dss.c between commit f65e384bec59 ("omapdss: dss:
> Fix clocks on OMAP363x") from Linus' tree and commit bd81ed081887
> ("OMAPDSS: DSS: use omapdss_version") from the omap_dss2 tree.
> 
> I fixed it up (using the omap_dss2 tree version) and can carry the fix as
> necessary (no action is required).

Thanks. I've now pulled the omapdss fixes that were merged in -rc7, and
resolved the conflicts.

 Tomi



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

WARNING: multiple messages have this Message-ID (diff)
From: Tomi Valkeinen <tomi.valkeinen@ti.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: <linux-next@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
	Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Subject: Re: linux-next: manual merge of the omap_dss2 tree with Linus' tree
Date: Tue, 27 Nov 2012 13:24:56 +0200	[thread overview]
Message-ID: <50B4A308.2090601@ti.com> (raw)
In-Reply-To: <20121126162233.9e7d7a036f2cc4a168cd3b6c@canb.auug.org.au>

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

Hi,

On 2012-11-26 07:22, Stephen Rothwell wrote:
> Hi Tomi,
> 
> Today's linux-next merge of the omap_dss2 tree got a conflict in
> drivers/video/omap2/dss/dss.c between commit f65e384bec59 ("omapdss: dss:
> Fix clocks on OMAP363x") from Linus' tree and commit bd81ed081887
> ("OMAPDSS: DSS: use omapdss_version") from the omap_dss2 tree.
> 
> I fixed it up (using the omap_dss2 tree version) and can carry the fix as
> necessary (no action is required).

Thanks. I've now pulled the omapdss fixes that were merged in -rc7, and
resolved the conflicts.

 Tomi



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

  reply	other threads:[~2012-11-27 11:25 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-11-26  5:22 linux-next: manual merge of the omap_dss2 tree with Linus' tree Stephen Rothwell
2012-11-27 11:24 ` Tomi Valkeinen [this message]
2012-11-27 11:24   ` Tomi Valkeinen
  -- strict thread matches above, loose matches on Subject: below --
2013-04-08  4:36 Stephen Rothwell
2013-04-09 10:10 ` Tomi Valkeinen
2013-04-09 10:10   ` Tomi Valkeinen
2013-04-10  0:13   ` Stephen Rothwell
2013-04-10  0:13     ` Stephen Rothwell
2013-04-10  0:41     ` Linus Torvalds
2012-09-07  3:29 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=50B4A308.2090601@ti.com \
    --to=tomi.valkeinen@ti.com \
    --cc=laurent.pinchart@ideasonboard.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --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.