From: Jason Cooper <jason@lakedaemon•net>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Olof Johansson <olof@lixom•net>, Arnd Bergmann <arnd@arndb•de>,
linux-arm-kernel@lists•infradead.org,
Thomas Petazzoni <thomas.petazzoni@free-electrons•com>,
linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Artem Bityutskiy <dedekind1@gmail•com>
Subject: Re: linux-next: manual merge of the arm-soc tree with the l2-mtd tree
Date: Mon, 24 Sep 2012 11:50:02 -0400 [thread overview]
Message-ID: <20120924155002.GP5469@titan.lakedaemon.net> (raw)
In-Reply-To: <20120924193934.76d4feafb689b265ff49c5c3@canb.auug.org.au>
On Mon, Sep 24, 2012 at 07:39:34PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the arm-soc tree got a conflict in
> drivers/mtd/nand/orion_nand.c between commit 11a3910e730e ("mtd:
> orion_nand: remove <mach/hardware.h> include") from the l2-mtd tree and
> commit c02cecb92ed4 ("ARM: orion: move platform_data definitions") from
> the arm-soc tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
The change below is correct, thanks.
thx,
Jason.
> --
> Cheers,
> Stephen Rothwell sfr@canb•auug.org.au
>
> diff --cc drivers/mtd/nand/orion_nand.c
> index 9ee436d,131b58a..0000000
> --- a/drivers/mtd/nand/orion_nand.c
> +++ b/drivers/mtd/nand/orion_nand.c
> @@@ -21,7 -21,8 +21,7 @@@
> #include <linux/err.h>
> #include <asm/io.h>
> #include <asm/sizes.h>
> - #include <plat/orion_nand.h>
> -#include <mach/hardware.h>
> + #include <linux/platform_data/mtd-orion_nand.h>
>
> static void orion_nand_cmd_ctrl(struct mtd_info *mtd, int cmd, unsigned int ctrl)
> {
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists•infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2012-09-24 15:50 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-24 9:39 linux-next: manual merge of the arm-soc tree with the l2-mtd tree Stephen Rothwell
2012-09-24 15:50 ` Jason Cooper [this message]
-- strict thread matches above, loose matches on Subject: below --
2013-07-02 5:33 Stephen Rothwell
2013-07-02 5:29 Stephen Rothwell
2013-07-02 5:44 ` Gupta, Pekon
2013-07-02 6:00 ` Olof Johansson
2013-07-02 6:18 ` Gupta, Pekon
2013-07-02 7:33 ` Artem Bityutskiy
2013-07-02 7:30 ` Artem Bityutskiy
2012-11-27 4:37 Stephen Rothwell
2012-11-26 10:16 Stephen Rothwell
2012-09-25 6:50 Stephen Rothwell
2012-05-14 8:47 Stephen Rothwell
2012-03-19 6:47 Stephen Rothwell
2012-03-19 9:00 ` Nicolas Ferre
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=20120924155002.GP5469@titan.lakedaemon.net \
--to=jason@lakedaemon$(echo .)net \
--cc=arnd@arndb$(echo .)de \
--cc=dedekind1@gmail$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=olof@lixom$(echo .)net \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=thomas.petazzoni@free-electrons$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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