linux-kernel - Re: linux-next: manual merge of the net tree with the tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Thu, 21 May 2009 15:29:10 -0700 (PDT)
From:	David Miller <davem@...emloft.net>
To:	sfr@...b.auug.org.au
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	abhijeet.kolekar@...el.com, linville@...driver.com,
	reinette.chatre@...el.com
Subject: Re: linux-next: manual merge of the net tree with the tree

From: David Miller <davem@...emloft.net>
Date: Thu, 21 May 2009 15:25:11 -0700 (PDT)

> From: Stephen Rothwell <sfr@...b.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.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/