All of lore.kernel.org
 help / color / mirror / Atom feed
From: "John W. Linville" <linville@tuxdriver.com>
To: linux-next@vger.kernel.org
Subject: coming conflicts between wireless-2.6 and wireless-next-2.6
Date: Tue, 17 Feb 2009 22:02:46 -0500	[thread overview]
Message-ID: <20090218030246.GA551@tuxdriver.com> (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
-- 
John W. Linville		Someday the world will need a hero, and you
linville@tuxdriver.com			might be all we have.  Be ready.

             reply	other threads:[~2009-02-18  3:12 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-02-18  3:02 John W. Linville [this message]
2009-02-19  5:01 ` coming conflicts between wireless-2.6 and wireless-next-2.6 Stephen Rothwell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20090218030246.GA551@tuxdriver.com \
    --to=linville@tuxdriver.com \
    --cc=linux-next@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.