From mboxrd@z Thu Jan 1 00:00:00 1970 From: Joel Becker Subject: Re: linux-next: Tree for August 19 Date: Wed, 19 Aug 2009 02:35:28 -0700 Message-ID: <20090819093528.GA16547@mail.oracle.com> References: <20090819190233.86e78493.sfr@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from rcsinet12.oracle.com ([148.87.113.124]:57129 "EHLO rgminet12.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751195AbZHSJgZ (ORCPT ); Wed, 19 Aug 2009 05:36:25 -0400 Content-Disposition: inline In-Reply-To: <20090819190233.86e78493.sfr@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org List-ID: To: Stephen Rothwell Cc: linux-next@vger.kernel.org, LKML 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