From mboxrd@z Thu Jan 1 00:00:00 1970 From: Greg KH Subject: Re: [PATCH 0/4] Fix up samsung-laptop.c duplication Date: Fri, 8 Apr 2011 08:26:25 -0700 Message-ID: <20110408152625.GA8053@suse.de> References: <1302274926-25985-1-git-send-email-mmarek@suse.cz> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from cantor.suse.de ([195.135.220.2]:50030 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932222Ab1DHPZm (ORCPT ); Fri, 8 Apr 2011 11:25:42 -0400 Content-Disposition: inline In-Reply-To: <1302274926-25985-1-git-send-email-mmarek@suse.cz> Sender: platform-driver-x86-owner@vger.kernel.org List-ID: To: Michal Marek , mjg@redhat.com Cc: platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org On Fri, Apr 08, 2011 at 05:02:02PM +0200, Michal Marek wrote: > Hi, > > The samsung-laptop.c driver got merged into drivers/platform/x86/, but a > copy also stayed in drivers/staging and further fixes got applied there. > A parallel build decides randomly which version to link into > samsung-laptop.ko, so this cannot work even if it was intentional. This > series applies the missing patches to drivers/platform/x86/ and deletes > the old version. Heh, yes, sorry about this, it was a miscommunication between me and Matthew. Matthew, do you want to take these patches in your tree, or do you want me to send them to Linus? Whatever is easier for you is fine with me. thanks, greg k-h