coming conflicts between wireless-2.6 and wireless-next-2.6

coming conflicts between wireless-2.6 and wireless-next-2.6

[John W. Linville]

There are several conflicts in the latest rounds of the wireless trees.
Most of them are simple.  One of them involves transporting some
changes from "orinoco: do not resgister NULL pm_notifier function"
between drivers/net/orinoco/orinoco.c (which no longer exists in -next)
over to drivers/net/orinoco/main.c.

I have an example 'merge-test' branch in wireless-next-2.6 to show
how I think the conflicts should be resolved -- enjoy! :-)

Thanks,

John
-- 
John W. Linville		Someday the world will need a hero, and you
linville@tuxdriver.com			might be all we have.  Be ready.

Re: coming conflicts between wireless-2.6 and wireless-next-2.6

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 727 bytes --]

Hi John,

On Tue, 17 Feb 2009 22:02:46 -0500 "John W. Linville" <linville@tuxdriver.com> wrote:
>
> There are several conflicts in the latest rounds of the wireless trees.
> Most of them are simple.  One of them involves transporting some
> changes from "orinoco: do not resgister NULL pm_notifier function"
> between drivers/net/orinoco/orinoco.c (which no longer exists in -next)
> over to drivers/net/orinoco/main.c.
> 
> I have an example 'merge-test' branch in wireless-next-2.6 to show
> how I think the conflicts should be resolved -- enjoy! :-)

Thanks for the heads up and your merge-test branch.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]