From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758284AbZFCP14 (ORCPT ); Wed, 3 Jun 2009 11:27:56 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756038AbZFCP1Q (ORCPT ); Wed, 3 Jun 2009 11:27:16 -0400 Received: from kroah.org ([198.145.64.141]:39108 "EHLO coco.kroah.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754825AbZFCP1L (ORCPT ); Wed, 3 Jun 2009 11:27:11 -0400 Date: Wed, 3 Jun 2009 07:59:22 -0700 From: Greg KH To: Jiri Kosina Cc: Stephen Rothwell , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Matt LaPlante , GeunSik Lim Subject: Re: linux-next: manual merge of the driver-core tree with the trivial tree Message-ID: <20090603145922.GC30890@kroah.com> References: <20090603171312.b80e30bb.sfr@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.19 (2009-01-05) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Jun 03, 2009 at 10:08:58AM +0200, Jiri Kosina wrote: > 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. Great, thanks for doing this. greg k-h