LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: David Woodhouse <dwmw2@infradead.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Jamie Iles <jamie@jamieiles.com>,
	Artem Bityutskiy <Artem.Bityutskiy@nokia.com>,
	Marc Zyngier <Marc.Zyngier@arm.com>,
	Russell King <rmk@arm.linux.org.uk>
Subject: linux-next: manual merge of the mtd tree with Linus' tree
Date: Fri, 27 May 2011 14:00:39 +1000	[thread overview]
Message-ID: <20110527140039.9bce4a2d.sfr@canb.auug.org.au> (raw)

Hi David,

Today's linux-next merge of the mtd tree got a conflict in
drivers/mtd/maps/physmap.c between commit b7281ca2a4b0 ("ARM: 6904/1:
MTD: Add integrator-flash feature to physmap") from Linus' tree and
commit 984e6d8ec5ab ("mtd: physmap: convert to mtd_device_register()")
from the mtd tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/mtd/maps/physmap.c
index 1a9b94f,d205926..0000000
--- a/drivers/mtd/maps/physmap.c
+++ b/drivers/mtd/maps/physmap.c
@@@ -92,10 -65,7 +81,8 @@@ static const char *rom_probe_types[] = 
  					"qinfo_probe",
  					"map_rom",
  					NULL };
- #ifdef CONFIG_MTD_PARTITIONS
 -static const char *part_probe_types[] = { "cmdlinepart", "RedBoot", NULL };
 +static const char *part_probe_types[] = { "cmdlinepart", "RedBoot", "afs",
 +					  NULL };
- #endif
  
  static int physmap_flash_probe(struct platform_device *dev)
  {

             reply	other threads:[~2011-05-27  4:00 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-05-27  4:00 Stephen Rothwell [this message]
2011-05-27  7:47 ` Artem Bityutskiy
  -- strict thread matches above, loose matches on Subject: below --
2021-08-17  4:49 Stephen Rothwell
2021-08-17  8:15 ` Sean Young
2021-08-17  8:41   ` Miquel Raynal
2019-01-29  0:17 Stephen Rothwell
2019-01-29 14:12 ` Boris Brezillon
2011-05-27  4:00 Stephen Rothwell
2011-05-27  7:43 ` Artem Bityutskiy
2010-10-26  0:32 Stephen Rothwell
2010-08-07  3:37 Stephen Rothwell
2010-04-29  2:58 Stephen Rothwell
2009-06-01  4:00 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=20110527140039.9bce4a2d.sfr@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=Artem.Bityutskiy@nokia.com \
    --cc=Marc.Zyngier@arm.com \
    --cc=dwmw2@infradead.org \
    --cc=jamie@jamieiles.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=rmk@arm.linux.org.uk \
    --subject='Re: linux-next: manual merge of the mtd tree with Linus'\'' tree' \
    /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

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).