From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754106Ab1LADv2 (ORCPT ); Wed, 30 Nov 2011 22:51:28 -0500 Received: from out4.smtp.messagingengine.com ([66.111.4.28]:35129 "EHLO out4.smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753997Ab1LADv1 (ORCPT ); Wed, 30 Nov 2011 22:51:27 -0500 X-Sasl-enc: hRzAX2l9lTvEI1rLA50mQ3BRBegkMpfu/wB42caiI88y 1322711485 Date: Wed, 30 Nov 2011 19:51:13 -0800 From: Greg KH To: Stephen Rothwell Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, "K. Y. Srinivasan" , Thomas Meyer , Jiri Kosina Subject: Re: linux-next: manual merge of the staging tree with the hid tree Message-ID: <20111201035113.GA7647@kroah.com> References: <20111201143952.9aea929b16c7212570fc1bd2@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20111201143952.9aea929b16c7212570fc1bd2@canb.auug.org.au> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Dec 01, 2011 at 02:39:52PM +1100, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the staging tree got a conflict in > drivers/hid/hid-hyperv.c between commit b95f5bcb811e ("HID: Move the > hid-hyperv driver out of staging") from the hid tree and various commits > from the staging tree (this was drivers/staging/hv/hv_mouse.c). > > The commit message says that all the changes that happened when this file > moved from staging have also been applied to the staging file, so I just > used the version from the hid tree. Ok, that's fine, Jiri, want me to just delete the driver from my tree now to remove any of these conflicts? thanks, greg k-h