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] [day] [month] [year] [list]

Message-Id: <1244016851.7176.32.camel@johannes.local>
Date:	Wed, 03 Jun 2009 10:14:11 +0200
From:	Johannes Berg <johannes@...solutions.net>
To:	Jiri Kosina <jkosina@...e.cz>
Cc:	Stephen Rothwell <sfr@...b.auug.org.au>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Matt LaPlante <kernel1@...erdogtech.com>,
	"John W. Linville" <linville@...driver.com>
Subject: Re: linux-next: manual merge of the trivial tree with the wireless
 tree

On Wed, 2009-06-03 at 10:07 +0200, Jiri Kosina wrote:
> On Wed, 3 Jun 2009, Stephen Rothwell wrote:
> 
> > Today's linux-next merge of the trivial tree got a conflict in 
> > Documentation/rfkill.txt between commit 
> > c6d660ce29295d344fcdc3654274b4a0aad1a9c8 ("rfkill: rewrite") from the 
> > wireless tree and commit 9976d9daf91d146724ad9c336f74c60d2195c386 
> > ("trivial: Miscellaneous documentation typo fixes") from the trivial 
> > tree.
> > I just used the version from the wireless tree since it has been
> > basically rewritten there (except I applied the "transmiter" to
> > "transmitter" fix - see below).  Maybe the part of the trivial tree patch
> > that affects this file should be dropped.
> 
> Hi,
> 
> thanks for letting me know. I have dropped the Documentation/rfkill.txt 
> hunk completely. 
> 
> Wireless guys, will you please apply the transmiter -> transmitter fix to 
> your tree?

Will do.

johannes

Download attachment "signature.asc" of type "application/pgp-signature" (802 bytes)