Skip to contentSkip to conversation

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

DISCUSSION John W. Linville 2 participants 2 messages Feb 18, 2009 – Feb 19, 2009 Linux-next tree

lore
Share & tools
lore

John W. Linville

author
#0 lore raw

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

Signature · 2 lines
John W. Linville		Someday the world will need a hero, and you
[email protected]			might be all we have.  Be ready.
#1 lore raw

Hi John,

Quoted 9 lines · On Tue, 17 Feb 2009 22:02:46 -0500 "John W. Linville" <[email protected]>…

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.

Signature · 3 lines
Cheers,
Stephen Rothwell                    [email protected]
http://www.canb.auug.org.au/~sfr/