From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752656AbZKTScM (ORCPT ); Fri, 20 Nov 2009 13:32:12 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754497AbZKTScD (ORCPT ); Fri, 20 Nov 2009 13:32:03 -0500 Received: from kroah.org ([198.145.64.141]:46733 "EHLO coco.kroah.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752656AbZKTScA (ORCPT ); Fri, 20 Nov 2009 13:32:00 -0500 Date: Fri, 20 Nov 2009 10:29:03 -0800 From: Greg KH To: Stephen Rothwell Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Dominik Brodowski , Vadim Mutilin Subject: Re: linux-next: manual merge of the staging tree with the pcmcia tree Message-ID: <20091120182903.GB4804@kroah.com> References: <20091109181544.454695c0.sfr@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20091109181544.454695c0.sfr@canb.auug.org.au> User-Agent: Mutt/1.5.20 (2009-06-14) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Nov 09, 2009 at 06:15:44PM +1100, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the staging tree got a conflict in > drivers/staging/comedi/drivers/cb_das16_cs.c between commit > 4e338b7f55b4c30e60fa3fa9ff3d21e930f40116 ("pcmcia/staging: update comedi > drivers") from the pcmcia tree and commit > e18c724339a542aac71d1d47b0695bf7b4a5c3a3 ("STAGING: comedi: cb_das16_cs: > fixing coding style errors") from the staging tree. > > I fixed it up (using the pcmcia tree version when there is a clash) and > can carry the fix as necessary. > > [Greg, that staging tree commit has no SOB from its author ...] Good catch, I missed that :( I've now dropped this patch from my tree, so it should be fine now. thanks, greg k-h