linux-kernel - Re: linux-next: manual merge of the wireless tree with Linus' tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <AANLkTimNX=uYZLTfcxqXQVZCpJDCpdYKRubyy=8afdAS@mail.gmail.com>
Date:	Tue, 21 Sep 2010 10:57:29 +0200
From:	Ohad Ben-Cohen <ohad@...ery.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	"John W. Linville" <linville@...driver.com>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Grazvydas Ignotas <notasas@...il.com>,
	Tony Lindgren <tony@...mide.com>
Subject: Re: linux-next: manual merge of the wireless tree with Linus' tree

On Tue, Sep 21, 2010 at 8:53 AM, Ohad Ben-Cohen <ohad@...ery.com> wrote:
> On Tue, Sep 21, 2010 at 4:09 AM, Stephen Rothwell <sfr@...b.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.

Ok, figured this out - the correct patch _was_ taken, but commit
79ccf549b33c613b57eebcb03f8b24644c545a88 ("omap3: pandora: add NAND
and
wifi support") only came later, so the "#include <linux/spi/wl12xx.h>"
was only removed in the merge (so it was dropped from the original
patch).

Anyway your fix is good Stephen, Thank you.


>> --
>> Cheers,
>> Stephen Rothwell                    sfr@...b.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>
>>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/