* coming conflicts between wireless-2.6 and wireless-next-2.6
@ 2009-02-18 3:02 John W. Linville
2009-02-19 5:01 ` Stephen Rothwell
0 siblings, 1 reply; 2+ messages in thread
From: John W. Linville @ 2009-02-18 3:02 UTC (permalink / raw)
To: linux-next
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.
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: coming conflicts between wireless-2.6 and wireless-next-2.6
2009-02-18 3:02 coming conflicts between wireless-2.6 and wireless-next-2.6 John W. Linville
@ 2009-02-19 5:01 ` Stephen Rothwell
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2009-02-19 5:01 UTC (permalink / raw)
To: John W. Linville; +Cc: linux-next
[-- 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 --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-02-19 5:01 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-02-18 3:02 coming conflicts between wireless-2.6 and wireless-next-2.6 John W. Linville
2009-02-19 5:01 ` Stephen Rothwell
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).