* linux-next: manual merge of the net/wireless trees with the wireless-current tree
@ 2009-11-11 2:01 Stephen Rothwell
2009-11-11 14:54 ` John W. Linville
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2009-11-11 2:01 UTC (permalink / raw)
To: David Miller, netdev
Cc: linux-next, linux-kernel, Wey-Yi Guy, John W. Linville
[-- Attachment #1: Type: text/plain, Size: 574 bytes --]
Hi all,
Today's linux-next merge of the net tree got conflicts in
drivers/net/wireless/iwlwifi/iwl-1000.c,
drivers/net/wireless/iwlwifi/iwl-6000.c and
drivers/net/wireless/iwlwifi/iwl-core.h between commits in the
wireless-current tree and commits in the net (wireless) tree.
I used the versions from the net tree except where obvious additions
had been made in the wireless-current tree. The fixes may not be
correct - someone should merge the wireless-current tree into the
net tree.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the net/wireless trees with the wireless-current tree
2009-11-11 2:01 linux-next: manual merge of the net/wireless trees with the wireless-current tree Stephen Rothwell
@ 2009-11-11 14:54 ` John W. Linville
0 siblings, 0 replies; 2+ messages in thread
From: John W. Linville @ 2009-11-11 14:54 UTC (permalink / raw)
To: Stephen Rothwell
Cc: David Miller, netdev, linux-next, linux-kernel, Wey-Yi Guy
On Wed, Nov 11, 2009 at 01:01:19PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the net tree got conflicts in
> drivers/net/wireless/iwlwifi/iwl-1000.c,
> drivers/net/wireless/iwlwifi/iwl-6000.c and
> drivers/net/wireless/iwlwifi/iwl-core.h between commits in the
> wireless-current tree and commits in the net (wireless) tree.
>
> I used the versions from the net tree except where obvious additions
> had been made in the wireless-current tree. The fixes may not be
> correct - someone should merge the wireless-current tree into the
> net tree.
Yeah, these conflicts should all be resolved by taking the bigger hunk.
The smaller hunk is duplicative because a patch that has already
been sent to net-next-2.6 is going to be sent for net-2.6 as well
(to support a regression fix).
I'll probably send the wireless-2.6 pull request today. Perhaps after
Dave pulls that (and Linus pulls from him), Dave can pull net-2.6
into net-next-2.6 to resolve the issue.
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
end of thread, other threads:[~2009-11-11 14:54 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-11-11 2:01 linux-next: manual merge of the net/wireless trees with the wireless-current tree Stephen Rothwell
2009-11-11 14:54 ` John W. Linville
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).