From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1752709AbbC2OhM (ORCPT <rfc822;w@1wt.eu>);
	Sun, 29 Mar 2015 10:37:12 -0400
Received: from mx1.redhat.com ([209.132.183.28]:36208 "EHLO mx1.redhat.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1752438AbbC2OhI (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Sun, 29 Mar 2015 10:37:08 -0400
Date: Sun, 29 Mar 2015 16:36:59 +0200
From: "Michael S. Tsirkin" <mst@redhat.com>
To: James Bottomley <James.Bottomley@HansenPartnership.com>
Cc: linux-kernel@vger.kernel.org, Michael Reed <mdr@sgi.com>,
        linux-scsi@vger.kernel.org
Subject: Re: [PATCH 61/86] scsi/qla1280: use uapi/linux/pci_ids.h directly
Message-ID: <20150329162830-mutt-send-email-mst@redhat.com>
References: <1427635734-24786-1-git-send-email-mst@redhat.com>
 <1427635734-24786-62-git-send-email-mst@redhat.com>
 <1427637816.25464.27.camel@HansenPartnership.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1427637816.25464.27.camel@HansenPartnership.com>
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Sun, Mar 29, 2015 at 05:03:36PM +0300, James Bottomley wrote:
> On Sun, 2015-03-29 at 15:42 +0200, Michael S. Tsirkin wrote:
> > Header moved from linux/pci_ids.h to uapi/linux/pci_ids.h,
> > use the new header directly so we can drop
> > the wrapper in include/linux/pci_ids.h.
> > 
> > Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> > ---
> >  drivers/scsi/qla1280.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/drivers/scsi/qla1280.c b/drivers/scsi/qla1280.c
> > index c68a66e..b2ada21 100644
> > --- a/drivers/scsi/qla1280.c
> > +++ b/drivers/scsi/qla1280.c
> > @@ -348,7 +348,7 @@
> >  #include <linux/pci.h>
> >  #include <linux/proc_fs.h>
> >  #include <linux/stat.h>
> > -#include <linux/pci_ids.h>
> > +#include <uapi/linux/pci_ids.h>
> 
> This is bogus, isn't it?  There's a -Iuapi somewhere in the kernel
> compile line so the original include is still valid.  Zorro does this:
> zorro_ids.h is exclusively in uapi but the include is still
> 
> #include <linux/zorro_ids.h>
> 
> James
> 


Hmm, that's true. I didn't know.  A bunch of files pull in headers from uapi
explicitly, so I assumed it's a good idea.  Do you think it's better to include
uapi files using short linux/<x>.h, or the full uapi/linux/<x>.h?  Linux has a
mix of both.

-- 
MST