From: Greg KH <greg@kroah.com>
To: Jiri Kosina <jkosina@suse.cz>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Matt LaPlante <kernel1@cyberdogtech.com>,
GeunSik Lim <leemgs1@gmail.com>
Subject: Re: linux-next: manual merge of the driver-core tree with the trivial tree
Date: Wed, 3 Jun 2009 07:59:22 -0700 [thread overview]
Message-ID: <20090603145922.GC30890@kroah.com> (raw)
In-Reply-To: <alpine.LNX.2.00.0906031007510.7457@wotan.suse.de>
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
prev parent reply other threads:[~2009-06-03 15:27 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-06-03 7:13 linux-next: manual merge of the driver-core tree with the trivial tree Stephen Rothwell
2009-06-03 8:08 ` Jiri Kosina
2009-06-03 14:59 ` Greg KH [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090603145922.GC30890@kroah.com \
--to=greg@kroah.com \
--cc=jkosina@suse.cz \
--cc=kernel1@cyberdogtech.com \
--cc=leemgs1@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.