linux-kernel - Re: 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-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <alpine.LSU.2.00.0911172317560.15039@wotan.suse.de>
Date:	Tue, 17 Nov 2009 23:18:25 +0100 (CET)
From:	Jiri Kosina <jkosina@...e.cz>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
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: Re: linux-next: manual merge of the trivial tree with the wireless
 tree

On Tue, 17 Nov 2009, Stephen Rothwell wrote:

> 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.

Thanks for letting me know, I have dropped the rt2800usb bits from my 
queue, so this conflict should now be gone.

-- 
Jiri Kosina
SUSE Labs, Novell Inc.
--
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/