From: "John W. Linville" <linville@tuxdriver.com>
To: David Miller <davem@davemloft.net>
Cc: sfr@canb.auug.org.au, linux-next@vger.kernel.org,
linux-kernel@vger.kernel.org, abhijeet.kolekar@intel.com,
reinette.chatre@intel.com
Subject: Re: linux-next: manual merge of the net tree with the tree
Date: Thu, 21 May 2009 20:33:33 -0400 [thread overview]
Message-ID: <20090522003333.GA2646@tuxdriver.com> (raw)
In-Reply-To: <20090521.152511.171736740.davem@davemloft.net>
On Thu, May 21, 2009 at 03:25:11PM -0700, David Miller wrote:
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Thu, 21 May 2009 14:06:10 +1000
>
> > Today's linux-next merge of the net tree got a conflict in
> > drivers/net/wireless/iwlwifi/iwl-agn.c
> > drivers/net/wireless/iwlwifi/iwl3945-base.c between commit
> > fbc9f97bbf5e1eaee562eba93dc60faaff3f3bfa ("iwlwifi: do not cancel delayed
> > work inside spin_lock_irqsave") from the wireless-current tree and commit
> > 727882d62477ed45d248e8cd6d53cf794537b073 ("iwl3945: use iwl_set_mode in
> > 3945") from the net tree.
> >
> > I removed iwl{3945,}_set_mode() from and applied the following patch.
>
> I'll sort this out right now, thanks Stephen.
wireless-next-2.6 has a merge-test branch for reference.
Hth!
John
--
John W. Linville Someday the world will need a hero, and you
linville@tuxdriver.com might be all we have. Be ready.
next prev parent reply other threads:[~2009-05-22 0:45 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-05-21 4:06 linux-next: manual merge of the net tree with the tree Stephen Rothwell
2009-05-21 22:25 ` David Miller
2009-05-21 22:29 ` David Miller
2009-05-22 0:35 ` John W. Linville
2009-05-22 8:10 ` David Miller
2009-05-22 0:33 ` John W. Linville [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-08-22 1:51 Stephen Rothwell
2011-08-22 1:51 ` Stephen Rothwell
2011-08-23 18:10 ` Niklaus Giger
2011-01-04 2:28 Stephen Rothwell
2011-01-04 2:28 ` Stephen Rothwell
2010-10-12 0:17 Stephen Rothwell
2010-10-12 0:17 ` Stephen Rothwell
2010-10-12 3:51 ` Stephen Rothwell
2010-10-12 3:51 ` Stephen Rothwell
2010-10-12 5:56 ` Stefan Richter
2010-10-12 5:56 ` Stefan Richter
2009-07-13 2:50 Stephen Rothwell
2009-05-08 3:23 Stephen Rothwell
2009-05-08 7:49 ` David Miller
2009-05-08 8:21 ` Eric Dumazet
2009-04-21 1:06 Stephen Rothwell
2009-04-21 1:22 ` Herbert Xu
2009-04-21 8:33 ` David Miller
2009-04-21 11:08 ` Stephen Rothwell
2009-03-20 0:32 Stephen Rothwell
2009-03-20 4:38 ` Pantelis Koukousoulas
2009-03-20 8:24 ` Mark McLoughlin
2009-03-20 9:28 ` David Miller
2009-03-04 2:03 Stephen Rothwell
2009-02-05 3:00 Stephen Rothwell
2009-02-05 2:55 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=20090522003333.GA2646@tuxdriver.com \
--to=linville@tuxdriver.com \
--cc=abhijeet.kolekar@intel.com \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=reinette.chatre@intel.com \
--cc=sfr@canb.auug.org.au \
/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.