* linux-next: build failure after merge of the block tree
@ 2011-07-04 3:48 Stephen Rothwell
2011-07-04 10:03 ` [PATCH] compat_ioctl: fix make headers_check regression Johannes Stezenbach
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2011-07-04 3:48 UTC (permalink / raw)
To: Jens Axboe; +Cc: linux-next, linux-kernel, Johannes Stezenbach, Arnd Bergmann
[-- Attachment #1: Type: text/plain, Size: 428 bytes --]
Hi Jens,
After merging the block tree, today's linux-next build (x86_64
allmodconfig) failed like this:
include/linux/fd.h:6: included file 'linux/compat.h' is not exported
Caused by commit 390192b30057 ("compat_ioctl: fix warning caused by
qemu").
I have used the block tree from next-20110701 for today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH] compat_ioctl: fix make headers_check regression 2011-07-04 3:48 linux-next: build failure after merge of the block tree Stephen Rothwell @ 2011-07-04 10:03 ` Johannes Stezenbach 2011-07-06 22:51 ` Johannes Stezenbach 2011-07-07 6:19 ` Jens Axboe 0 siblings, 2 replies; 6+ messages in thread From: Johannes Stezenbach @ 2011-07-04 10:03 UTC (permalink / raw) To: Stephen Rothwell; +Cc: Jens Axboe, linux-next, linux-kernel, Arnd Bergmann Fix headers_check error introduced by 390192b30057: include/linux/fd.h:6: included file 'linux/compat.h' is not exported Signed-off-by: Johannes Stezenbach <js@sig21.net> --- I used the same style as in linux/usbdevice_fs.h, hope that's OK. include/linux/fd.h | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/include/linux/fd.h b/include/linux/fd.h index c6a68d0..72202b1 100644 --- a/include/linux/fd.h +++ b/include/linux/fd.h @@ -3,7 +3,6 @@ #include <linux/ioctl.h> #include <linux/compiler.h> -#include <linux/compat.h> /* New file layout: Now the ioctl definitions immediately follow the * definitions of the structures that they use */ @@ -378,7 +377,11 @@ struct floppy_raw_cmd { #define FDEJECT _IO(2, 0x5a) /* eject the disk */ + +#ifdef __KERNEL__ #ifdef CONFIG_COMPAT +#include <linux/compat.h> + struct compat_floppy_struct { compat_uint_t size; compat_uint_t sect; @@ -394,5 +397,6 @@ struct compat_floppy_struct { #define FDGETPRM32 _IOR(2, 0x04, struct compat_floppy_struct) #endif +#endif #endif ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] compat_ioctl: fix make headers_check regression 2011-07-04 10:03 ` [PATCH] compat_ioctl: fix make headers_check regression Johannes Stezenbach @ 2011-07-06 22:51 ` Johannes Stezenbach 2011-07-06 23:11 ` Andrew Morton 2011-07-07 6:19 ` Jens Axboe 1 sibling, 1 reply; 6+ messages in thread From: Johannes Stezenbach @ 2011-07-06 22:51 UTC (permalink / raw) To: Stephen Rothwell Cc: Jens Axboe, linux-next, linux-kernel, Arnd Bergmann, akpm Hi, On Mon, Jul 04, 2011 at 12:03:16PM +0200, Johannes Stezenbach wrote: > Fix headers_check error introduced by 390192b30057: > > include/linux/fd.h:6: included file 'linux/compat.h' is not exported > > Signed-off-by: Johannes Stezenbach <js@sig21.net> > --- > I used the same style as in linux/usbdevice_fs.h, hope > that's OK. I just got an "added to -mm tree" mail for the original patch, so I wonder what's with this fix? Johannes > include/linux/fd.h | 6 +++++- > 1 files changed, 5 insertions(+), 1 deletions(-) > > diff --git a/include/linux/fd.h b/include/linux/fd.h > index c6a68d0..72202b1 100644 > --- a/include/linux/fd.h > +++ b/include/linux/fd.h > @@ -3,7 +3,6 @@ > > #include <linux/ioctl.h> > #include <linux/compiler.h> > -#include <linux/compat.h> > > /* New file layout: Now the ioctl definitions immediately follow the > * definitions of the structures that they use */ > @@ -378,7 +377,11 @@ struct floppy_raw_cmd { > #define FDEJECT _IO(2, 0x5a) > /* eject the disk */ > > + > +#ifdef __KERNEL__ > #ifdef CONFIG_COMPAT > +#include <linux/compat.h> > + > struct compat_floppy_struct { > compat_uint_t size; > compat_uint_t sect; > @@ -394,5 +397,6 @@ struct compat_floppy_struct { > > #define FDGETPRM32 _IOR(2, 0x04, struct compat_floppy_struct) > #endif > +#endif > > #endif ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] compat_ioctl: fix make headers_check regression 2011-07-06 22:51 ` Johannes Stezenbach @ 2011-07-06 23:11 ` Andrew Morton 2011-07-07 8:32 ` Johannes Stezenbach 0 siblings, 1 reply; 6+ messages in thread From: Andrew Morton @ 2011-07-06 23:11 UTC (permalink / raw) To: Johannes Stezenbach Cc: Stephen Rothwell, Jens Axboe, linux-next, linux-kernel, Arnd Bergmann On Thu, 7 Jul 2011 00:51:40 +0200 Johannes Stezenbach <js@sig21.net> wrote: > On Mon, Jul 04, 2011 at 12:03:16PM +0200, Johannes Stezenbach wrote: > > Fix headers_check error introduced by 390192b30057: > > > > include/linux/fd.h:6: included file 'linux/compat.h' is not exported > > > > Signed-off-by: Johannes Stezenbach <js@sig21.net> > > --- > > I used the same style as in linux/usbdevice_fs.h, hope > > that's OK. > > > I just got an "added to -mm tree" mail for the original patch, so I > wonder what's with this fix? What does the "original patch" refer to. Also, there's no commit 390192b30057. Commit ID's can change. This is why we ask people to also include the patch title when describing patches by SHA ID's Please let's just start again. Tell us what is going on here. ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] compat_ioctl: fix make headers_check regression 2011-07-06 23:11 ` Andrew Morton @ 2011-07-07 8:32 ` Johannes Stezenbach 0 siblings, 0 replies; 6+ messages in thread From: Johannes Stezenbach @ 2011-07-07 8:32 UTC (permalink / raw) To: Andrew Morton Cc: Stephen Rothwell, Jens Axboe, linux-next, linux-kernel, Arnd Bergmann On Wed, Jul 06, 2011 at 04:11:32PM -0700, Andrew Morton wrote: > On Thu, 7 Jul 2011 00:51:40 +0200 > Johannes Stezenbach <js@sig21.net> wrote: > > > On Mon, Jul 04, 2011 at 12:03:16PM +0200, Johannes Stezenbach wrote: > > > Fix headers_check error introduced by 390192b30057: > > > > > > include/linux/fd.h:6: included file 'linux/compat.h' is not exported > > > > > > Signed-off-by: Johannes Stezenbach <js@sig21.net> > > > --- > > > I used the same style as in linux/usbdevice_fs.h, hope > > > that's OK. > > > > > > I just got an "added to -mm tree" mail for the original patch, so I > > wonder what's with this fix? > > What does the "original patch" refer to. "compat_ioctl: fix warning caused by qemu" > Also, there's no commit 390192b30057. Commit ID's can change. This is > why we ask people to also include the patch title when describing > patches by SHA ID's I see, will do in the future > Please let's just start again. Tell us what is going on here. Well, I'm confused by the -mm workflow. The "original" patch 390192b30057 is in git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git for-3.1/core http://git.kernel.org/?p=linux/kernel/git/axboe/linux-block.git;a=commit;h=390192b300570b2bc721d77067ca133f58015ae8 And this fix now, too: http://git.kernel.org/?p=linux/kernel/git/axboe/linux-block.git;a=commit;h=719c0c590609809365c6f3da2f923cd84dc99113 Johannes ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] compat_ioctl: fix make headers_check regression 2011-07-04 10:03 ` [PATCH] compat_ioctl: fix make headers_check regression Johannes Stezenbach 2011-07-06 22:51 ` Johannes Stezenbach @ 2011-07-07 6:19 ` Jens Axboe 1 sibling, 0 replies; 6+ messages in thread From: Jens Axboe @ 2011-07-07 6:19 UTC (permalink / raw) To: Johannes Stezenbach Cc: Stephen Rothwell, linux-next, linux-kernel, Arnd Bergmann On 2011-07-04 12:03, Johannes Stezenbach wrote: > Fix headers_check error introduced by 390192b30057: > > include/linux/fd.h:6: included file 'linux/compat.h' is not exported Thanks! -- Jens Axboe ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2011-07-07 8:32 UTC | newest] Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2011-07-04 3:48 linux-next: build failure after merge of the block tree Stephen Rothwell 2011-07-04 10:03 ` [PATCH] compat_ioctl: fix make headers_check regression Johannes Stezenbach 2011-07-06 22:51 ` Johannes Stezenbach 2011-07-06 23:11 ` Andrew Morton 2011-07-07 8:32 ` Johannes Stezenbach 2011-07-07 6:19 ` Jens Axboe
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.