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] [day] [month] [year] [list]

Date:	Tue, 21 Sep 2010 11:08:21 -0400
From:	"John W. Linville" <linville@...driver.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Grazvydas Ignotas <notasas@...il.com>,
	Tony Lindgren <tony@...mide.com>,
	Ohad Ben-Cohen <ohad@...ery.com>
Subject: Re: linux-next: manual merge of the wireless tree with Linus' tree

On Tue, Sep 21, 2010 at 12:09:19PM +1000, Stephen Rothwell wrote:
> Hi John,
> 
> Today's linux-next merge of the wireless tree got a conflict in
> arch/arm/mach-omap2/board-omap3pandora.c between commit
> 79ccf549b33c613b57eebcb03f8b24644c545a88 ("omap3: pandora: add NAND and
> wifi support") from Linus' tree and commit
> 664279b5121b480f31ffecf202cd2d1591ff356e ("wl12xx: make wl12xx.h common
> to both spi and sdio") from the wireless tree.
> 
> The wireless tree commit copied the include/linux/spi/wl12xx.h to
> include/linux but did not remove the spi/ one.  Later patches modified
> 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.

Hmmmm...not sure how the delete part of the move got lost...  I'll fix
it up.

Thanks for letting me know!

John
-- 
John W. Linville		Someday the world will need a hero, and you
linville@...driver.com			might be all we have.  Be ready.
--
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/