From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751403AbZHSJg1 (ORCPT ); Wed, 19 Aug 2009 05:36:27 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751221AbZHSJg0 (ORCPT ); Wed, 19 Aug 2009 05:36:26 -0400 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 Date: Wed, 19 Aug 2009 02:35:28 -0700 From: Joel Becker To: Stephen Rothwell Cc: linux-next@vger.kernel.org, LKML Subject: Re: linux-next: Tree for August 19 Message-ID: <20090819093528.GA16547@mail.oracle.com> Mail-Followup-To: Stephen Rothwell , linux-next@vger.kernel.org, LKML References: <20090819190233.86e78493.sfr@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20090819190233.86e78493.sfr@canb.auug.org.au> X-Burt-Line: Trees are cool. X-Red-Smith: Ninety feet between bases is perhaps as close as man has ever come to perfection. User-Agent: Mutt/1.5.20 (2009-06-14) X-Source-IP: acsmt356.oracle.com [141.146.40.156] X-Auth-Type: Internal IP X-CT-RefId: str=0001.0A090205.4A8BC78F.0071:SCFMA4539814,ss=1,fgs=0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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