netdev - Re: linux-next: manual merge of the net tree with the wireless-current 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: Windows password security audit tool. GUI, reports in PDF.

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

Message-Id: <20100513110248.06cc6ee7.sfr@canb.auug.org.au>
Date:	Thu, 13 May 2010 11:02:48 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	reinette chatre <reinette.chatre@...el.com>
Cc:	David Miller <davem@...emloft.net>, <netdev@...r.kernel.org>,
	<linux-next@...r.kernel.org>, <linux-kernel@...r.kernel.org>,
	"Berg, Johannes" <johannes.berg@...el.com>,
	"John W. Linville" <linville@...driver.com>
Subject: Re: linux-next: manual merge of the net tree with the
 wireless-current tree

Hi Reinette,

On Wed, 12 May 2010 09:15:43 -0700 reinette chatre <reinette.chatre@...el.com> wrote:
>
> Please note that this member of iwl_priv is now located in two
> places ... here and also in the device specific union a few lines up
> inside the _agn struct. In the code it is indeed the one in the _agn
> struct that is being used (see usage in iwl-agn.c), so adding this line
> is not necessary.
> 
> This should not cause any problems with driver operation and can
> probably remain as such if indeed it is cleaned up somewhere else before
> it hits you again or linux-2.6.

Thanks for pointing this out.  I will update my merge resolution in
linux-next and I assume it will be done correctly when Dave or John also
do that merge.

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped