linux-kernel - linux-next: manual merge of the trivial tree with the wireless 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-next>] [day] [month] [year] [list]

Message-Id: <20091117154957.a23c959b.sfr@canb.auug.org.au>
Date:	Tue, 17 Nov 2009 15:49:57 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Jiri Kosina <jkosina@...e.cz>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	"André Goddard Rosa" <andre.goddard@...il.com>,
	Bartlomiej Zolnierkiewicz <bzolnier@...il.com>,
	"John W. Linville" <linville@...driver.com>
Subject: linux-next: manual merge of the trivial tree with the wireless tree

Hi Jiri,

Today's linux-next merge of the trivial tree got a conflict in
drivers/net/wireless/rt2x00/rt2800usb.h between various commits from the
wireless tree and commit 17530b1c635dfd1f258afc6b07b986b425d66ebd
("tree-wide: fix assorted typos all over the place") from the trivial
tree.

The wireless tree commits moved the code fixed by the trivial tree, but
also fixed it along the way, so I have ignored the trivial fixup for this
file.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped