From mboxrd@z Thu Jan 1 00:00:00 1970 From: Greg KH Subject: Re: linux-next: manual merge of the staging tree with the hid tree Date: Thu, 1 Dec 2011 10:39:56 -0800 Message-ID: <20111201183956.GA32559@kroah.com> References: <20111201143952.9aea929b16c7212570fc1bd2@canb.auug.org.au> <20111201035113.GA7647@kroah.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from out4.smtp.messagingengine.com ([66.111.4.28]:59111 "EHLO out4.smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755401Ab1LASkl (ORCPT ); Thu, 1 Dec 2011 13:40:41 -0500 Received: from compute5.internal (compute5.nyi.mail.srv.osa [10.202.2.45]) by gateway1.nyi.mail.srv.osa (Postfix) with ESMTP id 49AE022596 for ; Thu, 1 Dec 2011 13:40:41 -0500 (EST) Content-Disposition: inline In-Reply-To: <20111201035113.GA7647@kroah.com> Sender: linux-next-owner@vger.kernel.org List-ID: To: Stephen Rothwell Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, "K. Y. Srinivasan" , Thomas Meyer , Jiri Kosina On Wed, Nov 30, 2011 at 07:51:13PM -0800, Greg KH wrote: > 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? I've removed it from my tree now. thanks, greg k-h