linux-kernel - 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: Windows password security audit tool. GUI, reports in PDF.

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

Message-Id: <20090713125015.c3024be8.sfr@canb.auug.org.au>
Date:	Mon, 13 Jul 2009 12:50:15 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	David Miller <davem@...emloft.net>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	David Kilroy <kilroyd@...glemail.com>,
	Ben Hutchings <ben@...adent.org.uk>
Subject: linux-next: manual merge of the net tree with the  tree

Hi David,

Today's linux-next merge of the net tree got a conflict in
drivers/net/wireless/orinoco/main.c between commit
240c102d9c54fee7fdc87a4ef2fabc7eb539e00a ("netdev: restore MAC address
set and validate operations") from the net-current tree and
commit5381956b780e82805247c2ec8e32c4c665309394 ("orinoco: move netdev
interface creation to main driver") from the net tree.

Just overlapping removals.  I fixed it up and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped