mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Grant Likely <grant.likely@secretlab.ca>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Artem Bityutskiy <Artem.Bityutskiy@nokia.com>,
	David Woodhouse <dwmw2@infradead.org>,
	Rob Herring <rob.herring@calxeda.com>
Subject: Re: linux-next: manual merge of the devicetree tree with the mtd tree
Date: Wed, 5 Jan 2011 09:28:39 -0700	[thread overview]
Message-ID: <20110105162839.GC17272@angua.secretlab.ca> (raw)
In-Reply-To: <20110105134022.106d9e0b.sfr@canb.auug.org.au>

On Wed, Jan 05, 2011 at 01:40:22PM +1100, Stephen Rothwell wrote:
> Hi Grant,
> 
> Today's linux-next merge of the devicetree tree got a conflict in
> drivers/mtd/Kconfig between commit
> b7b6e08f9265db56129931983fc6c06d62c9f4f9 (mtd: Fix MTD_OF_PARTS for all
> arch and minor tidy of MTD_PARTITIONS"") from the mtd tree and commit
> 236cdc7bc718566a7e7cb9f763b51a8dcad88cbe ("of: make drivers depend on
> CONFIG_OF instead of CONFIG_PPC_OF") from the devicetree tree.
> 
> I just used the version from the mtd tree.

Thanks Stephen.  I've taken a look at both patches, and I agree that
is the correct resolution.

g.




  reply	other threads:[~2011-01-05 16:28 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-01-05  2:40 Stephen Rothwell
2011-01-05 16:28 ` Grant Likely [this message]
2021-06-15  2:59 Stephen Rothwell
2021-06-15 16:47 ` Miquel Raynal
2021-06-15 18:57   ` Rob Herring

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=20110105162839.GC17272@angua.secretlab.ca \
    --to=grant.likely@secretlab.ca \
    --cc=Artem.Bityutskiy@nokia.com \
    --cc=dwmw2@infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=rob.herring@calxeda.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®