From: Joel Becker <Joel.Becker@oracle.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, LKML <linux-kernel@vger.kernel.org>
Subject: Re: linux-next: Tree for August 19
Date: Wed, 19 Aug 2009 02:35:28 -0700 [thread overview]
Message-ID: <20090819093528.GA16547@mail.oracle.com> (raw)
In-Reply-To: <20090819190233.86e78493.sfr@canb.auug.org.au>
On Wed, Aug 19, 2009 at 07:02:33PM +1000, Stephen Rothwell wrote:
> Merging configfs/linux-next
> CONFLICT (content): Merge conflict in fs/configfs/dir.c
Silly question. The last time I had a conflict in next, you
emailed me the details. How do I go about finding them on my own
(without doing the complete merge you do)?
Joel
--
"Up and down that road in our worn out shoes,
Talking bout good things and singing the blues."
Joel Becker
Principal Software Developer
Oracle
E-mail: joel.becker@oracle.com
Phone: (650) 506-8127
next prev parent reply other threads:[~2009-08-19 9:36 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-08-19 9:02 linux-next: Tree for August 19 Stephen Rothwell
2009-08-19 9:35 ` Joel Becker [this message]
2009-08-24 7:30 ` Stephen Rothwell
2009-08-19 11:13 ` Next Aug 19: s390 build failure (arch/s390/kernel/built-in) Sachin Sant
2009-08-19 11:46 ` Ingo Molnar
2009-08-19 11:55 ` Sachin Sant
2009-08-19 12:15 ` [patch] " Ingo Molnar
2009-08-19 13:16 ` Jason Baron
2009-08-19 13:33 ` Sachin Sant
-- strict thread matches above, loose matches on Subject: below --
2010-08-19 4:39 linux-next: Tree for August 19 Stephen Rothwell
2008-08-19 8:54 Stephen Rothwell
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=20090819093528.GA16547@mail.oracle.com \
--to=joel.becker@oracle.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.