From: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
To: ext Stephen Rothwell <sfr@canb.auug.org.au>
Cc: David Woodhouse <dwmw2@infradead.org>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Jamie Iles <jamie@jamieiles.com>,
Marc Zyngier <Marc.Zyngier@arm.com>,
Russell King <rmk@arm.linux.org.uk>
Subject: Re: linux-next: manual merge of the mtd tree with Linus' tree
Date: Fri, 27 May 2011 10:47:44 +0300 [thread overview]
Message-ID: <1306482464.2785.154.camel@localhost> (raw)
In-Reply-To: <20110527140039.9bce4a2d.sfr@canb.auug.org.au>
On Fri, 2011-05-27 at 14:00 +1000, ext Stephen Rothwell wrote:
> 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.
Yes, this looks right, thanks.
--
Best Regards,
Artem Bityutskiy (Артём Битюцкий)
next prev parent reply other threads:[~2011-05-27 7:53 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-27 4:00 linux-next: manual merge of the mtd tree with Linus' tree Stephen Rothwell
2011-05-27 7:47 ` Artem Bityutskiy [this message]
-- 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=1306482464.2785.154.camel@localhost \
--to=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 \
--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.