From: David Miller <davem@davemloft•net>
To: sfr@canb•auug.org.au
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
abhijeet.kolekar@intel•com, linville@tuxdriver•com,
reinette.chatre@intel•com
Subject: Re: linux-next: manual merge of the net tree with the tree
Date: Thu, 21 May 2009 15:29:10 -0700 (PDT) [thread overview]
Message-ID: <20090521.152910.256913910.davem@davemloft.net> (raw)
In-Reply-To: <20090521.152511.171736740.davem@davemloft.net>
From: David Miller <davem@davemloft•net>
Date: Thu, 21 May 2009 15:25:11 -0700 (PDT)
> 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.
Sorry, I misread this. The conflict is created by the
wireless-current tree so it seems something John has to
sort out unless I've pulled that work into net-next-2.6 already.
John which is it?
Thanks.
next prev parent reply other threads:[~2009-05-21 22:29 UTC|newest]
Thread overview: 27+ 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 [this message]
2009-05-22 0:35 ` John W. Linville
2009-05-22 8:10 ` David Miller
2009-05-22 0:33 ` John W. Linville
-- strict thread matches above, loose matches on Subject: below --
2011-08-22 1:51 Stephen Rothwell
2011-08-23 18:10 ` Niklaus Giger
2011-01-04 2:28 Stephen Rothwell
2010-10-12 0:17 Stephen Rothwell
2010-10-12 3:51 ` Stephen Rothwell
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=20090521.152910.256913910.davem@davemloft.net \
--to=davem@davemloft$(echo .)net \
--cc=abhijeet.kolekar@intel$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linville@tuxdriver$(echo .)com \
--cc=reinette.chatre@intel$(echo .)com \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox