From mboxrd@z Thu Jan 1 00:00:00 1970 From: Greg KH Subject: Re: linux-next: manual merge of the char-misc tree with the ia64 tree Date: Tue, 15 Jul 2014 06:49:20 -0700 Message-ID: <20140715134920.GC17795@kroah.com> References: <20140715164349.5807b892@canb.auug.org.au> <20140715134458.GB17795@kroah.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from out3-smtp.messagingengine.com ([66.111.4.27]:59234 "EHLO out3-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750921AbaGONtn (ORCPT ); Tue, 15 Jul 2014 09:49:43 -0400 Received: from compute5.internal (compute5.nyi.mail.srv.osa [10.202.2.45]) by gateway1.nyi.mail.srv.osa (Postfix) with ESMTP id 7DF772207D for ; Tue, 15 Jul 2014 09:49:42 -0400 (EDT) Content-Disposition: inline In-Reply-To: <20140715134458.GB17795@kroah.com> Sender: linux-next-owner@vger.kernel.org List-ID: To: Stephen Rothwell Cc: Arnd Bergmann , "Chen, Gong" , Tony Luck , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Andreas Noever On Tue, Jul 15, 2014 at 06:44:58AM -0700, Greg KH wrote: > On Tue, Jul 15, 2014 at 04:43:49PM +1000, Stephen Rothwell wrote: > > Hi all, > > > > Today's linux-next merge of the char-misc tree got conflicts in > > drivers/Kconfig and drivers/Makefile between commit 76ac8275f296 > > ("trace, RAS: Add basic RAS trace event") from the ia64 tree and commit > > 16603153666d ("thunderbolt: Add initial cactus ridge NHI support") from > > the char-misc tree. > > > > I fixed it up (see below) and can carry the fix as necessary (no action > > is required). > > Looks good, thanks. Wait, do we really need a drivers/ras directory for one single driver? Why not put it in drivers/misc/ instead? A whole subdir at the top of drivers seems overkill and odd. As it's a memory driver, what about drivers/firmware/ or drivers/edac/ or drivers/platform? thanks, greg k-h