public inbox for linux-next@vger.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-next@vger.kernel.org>,
	"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
	"Nayak, Rajendra" <rnayak@ti.com>,
	Tony Lindgren <tony@atomide.com>,
	"Guruswamy, Senthilvadivu" <svadivu@ti.com>
Subject: Re: linux-next: manual merge of the omap_dss2 tree with the  tree
Date: Thu, 24 Feb 2011 10:52:38 +0200	[thread overview]
Message-ID: <1298537558.16119.33.camel@deskari> (raw)
In-Reply-To: <20110224142316.6706625a.sfr@canb.auug.org.au>

Hi,

On Wed, 2011-02-23 at 21:23 -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 commit
> 73a92aa4f1d6786eaa5b4e637eee648db0dfd7a7 ("omap3sdp: clean regulator
> supply mapping in board file") from the omap tree and commit
> b3e0ccec47b179b0d3a7bfdb9df7112e508b009c ("OMAP2,3 DSS2 Change driver
> name to omap_display") from the omap_dss2 tree.
> 
> I fixed it up (see below) and can carry this fix as necessary (though I
> have no idea if it is correct).
> 
> [The merge today did, however, lose most of the other conflicts, thanks]

It seems there was a small conflict resolution error when Tony merged my
patches (an extra regulator supply was left in the code). I fixed that
and rebased my tree on Tony's for-linus branch.

So I hope that now we're finally free of non-trivial conflicts =).

Thanks again.

 Tomi

  reply	other threads:[~2011-02-24  8:52 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-02-24  3:23 linux-next: manual merge of the omap_dss2 tree with the tree Stephen Rothwell
2011-02-24  8:52 ` Tomi Valkeinen [this message]
  -- strict thread matches above, loose matches on Subject: below --
2011-02-18  2:19 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=1298537558.16119.33.camel@deskari \
    --to=tomi.valkeinen@ti.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=rnayak@ti.com \
    --cc=sfr@canb.auug.org.au \
    --cc=svadivu@ti.com \
    --cc=tony@atomide.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