| 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
| ||
|
Message-ID: <alpine.LNX.2.00.0906031007510.7457@wotan.suse.de>
Date: Wed, 3 Jun 2009 10:08:58 +0200 (CEST)
From: Jiri Kosina <jkosina@...e.cz>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: Greg KH <greg@...ah.com>, linux-next@...r.kernel.org,
linux-kernel@...r.kernel.org,
Matt LaPlante <kernel1@...erdogtech.com>,
GeunSik Lim <leemgs1@...il.com>
Subject: Re: linux-next: manual merge of the driver-core tree with the trivial
tree
On Wed, 3 Jun 2009, Stephen Rothwell wrote:
> Today's linux-next merge of the driver-core tree got a conflict in
> Documentation/trace/ftrace.txt between commit
> 9976d9daf91d146724ad9c336f74c60d2195c386 ("trivial: Miscellaneous
> documentation typo fixes") from the trivial tree and commit
> b6b8b2b9588b3e09fea0da0e86f6b8bcba827b65 ("debugfs: Fix terminology
> inconsistency of dir name to mount debugfs filesystem") from the
> driver-core tree.
>
> The latter removes the text that is patched by the former. I just used
> the driver-core version. I suggest that the part of the trivial tree
> patch that touches this file be dropped.
Correct, the patch in trivial queue got obsoleted by the driver-core one.
I have just dropped the version I had.
Thanks,
--
Jiri Kosina
SUSE Labs
--
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/
Powered by blists - more mailing lists