From: Ohad Ben-Cohen <ohad@wizery.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: "John W. Linville" <linville@tuxdriver.com>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Grazvydas Ignotas <notasas@gmail.com>,
Tony Lindgren <tony@atomide.com>
Subject: Re: linux-next: manual merge of the wireless tree with Linus' tree
Date: Tue, 21 Sep 2010 08:53:43 +0200 [thread overview]
Message-ID: <AANLkTinxssqohSCfod8Q1emhJ6AB4Hkxo7EmkTtTxuf=@mail.gmail.com> (raw)
In-Reply-To: <20100921120919.a38723d3.sfr@canb.auug.org.au>
Hi Stephen,
On Tue, Sep 21, 2010 at 4:09 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> The wireless tree commit copied the include/linux/spi/wl12xx.h to
> include/linux but did not remove the spi/ one.
We had that one fixed in
http://www.mail-archive.com/linux-omap@vger.kernel.org/msg34910.html
but it seems an older patch accidentally got in.
> only the new one ... I fixed the above conflict (see below) on the
> assumption that the spi/ version of the header file should have been
> removed.
Yes, thank you. I'll send a patch to fix that in the wireless tree too.
Thanks,
Ohad.
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
>
> diff --cc arch/arm/mach-omap2/board-omap3pandora.c
> index dd3af2b,9b62b62..0000000
> --- a/arch/arm/mach-omap2/board-omap3pandora.c
> +++ b/arch/arm/mach-omap2/board-omap3pandora.c
> @@@ -25,9 -25,7 +25,9 @@@
> #include <linux/spi/ads7846.h>
> #include <linux/regulator/machine.h>
> #include <linux/i2c/twl.h>
> - #include <linux/spi/wl12xx.h>
> + #include <linux/wl12xx.h>
> +#include <linux/mtd/partitions.h>
> +#include <linux/mtd/nand.h>
> #include <linux/leds.h>
> #include <linux/input.h>
> #include <linux/input/matrix_keypad.h>
>
next prev parent reply other threads:[~2010-09-21 6:54 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-21 2:09 linux-next: manual merge of the wireless tree with Linus' tree Stephen Rothwell
2010-09-21 6:53 ` Ohad Ben-Cohen [this message]
2010-09-21 8:57 ` Ohad Ben-Cohen
2010-09-21 15:08 ` John W. Linville
-- strict thread matches above, loose matches on Subject: below --
2014-02-14 0:19 Stephen Rothwell
2012-01-04 1:40 Stephen Rothwell
2011-09-20 3:28 Stephen Rothwell
2011-09-20 12:55 ` John W. Linville
2011-09-20 3:22 Stephen Rothwell
2011-09-19 5:14 Stephen Rothwell
2011-09-19 5:28 ` Luciano Coelho
2011-09-15 3:14 Stephen Rothwell
2011-09-15 7:17 ` Helmut Schaa
2011-09-15 3:14 Stephen Rothwell
2011-08-30 3:46 Stephen Rothwell
2011-05-12 1:42 Stephen Rothwell
2011-05-11 1:52 Stephen Rothwell
2011-04-27 1:00 Stephen Rothwell
2011-04-13 2:30 Stephen Rothwell
2011-04-08 4:10 Stephen Rothwell
2011-04-08 5:11 ` Jussi Kivilinna
2011-04-08 4:10 Stephen Rothwell
2010-09-21 2:20 Stephen Rothwell
2010-08-17 1:52 Stephen Rothwell
2010-08-17 2:59 ` Rusty Russell
2010-08-17 3:07 ` Stephen Rothwell
2010-06-15 2:00 Stephen Rothwell
2010-06-15 14:42 ` John W. Linville
2010-05-10 1:27 Stephen Rothwell
2010-04-27 1:28 Stephen Rothwell
2010-01-06 2:29 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='AANLkTinxssqohSCfod8Q1emhJ6AB4Hkxo7EmkTtTxuf=@mail.gmail.com' \
--to=ohad@wizery.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linville@tuxdriver.com \
--cc=notasas@gmail.com \
--cc=sfr@canb.auug.org.au \
--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;
as well as URLs for NNTP newsgroup(s).