Re: linux-next: build failure after merge of the char-misc tree
Great, thanks! Oded On Tue, Jul 28, 2020 at 8:19 PM Greg KH wrote: > > On Tue, Jul 28, 2020 at 07:17:05PM +0200, Greg KH wrote: > > On Tue, Jul 28, 2020 at 06:23:59PM +1000, Stephen Rothwell wrote: > > > Hi Greg, > > > > > > On Tue, 28 Jul 2020 09:53:36 +0200 Greg KH wrote: > > > > > > > > On Tue, Jul 28, 2020 at 05:33:31PM +1000, Stephen Rothwell wrote: > > > > > Hi Greg, > > > > > > > > > > On Mon, 27 Jul 2020 11:24:48 +0200 Greg KH wrote: > > > > > > > > > > > > On Mon, Jul 27, 2020 at 06:08:31PM +1000, Stephen Rothwell wrote: > > > > > > > Hi all, > > > > > > > > > > > > > > After merging the char-misc tree, today's linux-next build (x86_64 > > > > > > > allmodconfig) failed like this: > > > > > > > > > > > > > > In file included from drivers/misc/habanalabs/goya/goya.c:8: > > > > > > > drivers/misc/habanalabs/goya/goyaP.h:12:10: fatal error: > > > > > > > habanalabs.h: No such file or directory > > > > > > >12 | #include "habanalabs.h" > > > > > > > | ^~ > > > > > > > In file included from > > > > > > > drivers/misc/habanalabs/goya/goya_security.c:8: > > > > > > > drivers/misc/habanalabs/goya/goyaP.h:12:10: fatal error: > > > > > > > habanalabs.h: No such file or directory > > > > > > >12 | #include "habanalabs.h" > > > > > > > | ^~ > > > > > > > > > > > > > > Presumably caused by commit > > > > > > > > > > > > > > 70b2f993ea4a ("habanalabs: create common folder") > > > > > > > > > > > > > > I have used the char-misc tree from next-20200724 for today. > > > > > > > > > > > > Ugh, this is a mess of a merge with this driver. > > > > > > > > > > > > Oded, I'll take Stephen's merge resolutions here and push out a new > > > > > > version, and try to resolve this error, but if you could verify I > > > > > > got it > > > > > > correct, that would be great. > > > > > > > > > > The conflicts are gone, but I still get these errors. > > > > > > > > Very odd, I can not duplicate this at all here. I just did a clean > > > > checkout of the char-misc-next branch and a full 'make allmodconfig' for > > > > x86_64, and it worked just fine. > > > > > > > > Are you sure it's not coming from some other tree? > > > > > > Do you build with a separate object tree? I always use make O=... > > > which makes the difference. I tested with just your tree. > > > > Ah, no, I do not. Odd, let me see what kind of crazy they are doing > > with include build directives... > > > > thanks for the hint. > > Ok, fix sent out, that should resolve this. > > thanks, > > greg k-h
Re: linux-next: build failure after merge of the char-misc tree
On Tue, Jul 28, 2020 at 07:17:05PM +0200, Greg KH wrote: > On Tue, Jul 28, 2020 at 06:23:59PM +1000, Stephen Rothwell wrote: > > Hi Greg, > > > > On Tue, 28 Jul 2020 09:53:36 +0200 Greg KH wrote: > > > > > > On Tue, Jul 28, 2020 at 05:33:31PM +1000, Stephen Rothwell wrote: > > > > Hi Greg, > > > > > > > > On Mon, 27 Jul 2020 11:24:48 +0200 Greg KH wrote: > > > > > > > > > > On Mon, Jul 27, 2020 at 06:08:31PM +1000, Stephen Rothwell wrote: > > > > > > Hi all, > > > > > > > > > > > > After merging the char-misc tree, today's linux-next build (x86_64 > > > > > > allmodconfig) failed like this: > > > > > > > > > > > > In file included from drivers/misc/habanalabs/goya/goya.c:8: > > > > > > drivers/misc/habanalabs/goya/goyaP.h:12:10: fatal error: > > > > > > habanalabs.h: No such file or directory > > > > > >12 | #include "habanalabs.h" > > > > > > | ^~ > > > > > > In file included from > > > > > > drivers/misc/habanalabs/goya/goya_security.c:8: > > > > > > drivers/misc/habanalabs/goya/goyaP.h:12:10: fatal error: > > > > > > habanalabs.h: No such file or directory > > > > > >12 | #include "habanalabs.h" > > > > > > | ^~ > > > > > > > > > > > > Presumably caused by commit > > > > > > > > > > > > 70b2f993ea4a ("habanalabs: create common folder") > > > > > > > > > > > > I have used the char-misc tree from next-20200724 for today. > > > > > > > > > > Ugh, this is a mess of a merge with this driver. > > > > > > > > > > Oded, I'll take Stephen's merge resolutions here and push out a new > > > > > version, and try to resolve this error, but if you could verify I got > > > > > it > > > > > correct, that would be great. > > > > > > > > The conflicts are gone, but I still get these errors. > > > > > > Very odd, I can not duplicate this at all here. I just did a clean > > > checkout of the char-misc-next branch and a full 'make allmodconfig' for > > > x86_64, and it worked just fine. > > > > > > Are you sure it's not coming from some other tree? > > > > Do you build with a separate object tree? I always use make O=... > > which makes the difference. I tested with just your tree. > > Ah, no, I do not. Odd, let me see what kind of crazy they are doing > with include build directives... > > thanks for the hint. Ok, fix sent out, that should resolve this. thanks, greg k-h
Re: linux-next: build failure after merge of the char-misc tree
On Tue, Jul 28, 2020 at 06:23:59PM +1000, Stephen Rothwell wrote: > Hi Greg, > > On Tue, 28 Jul 2020 09:53:36 +0200 Greg KH wrote: > > > > On Tue, Jul 28, 2020 at 05:33:31PM +1000, Stephen Rothwell wrote: > > > Hi Greg, > > > > > > On Mon, 27 Jul 2020 11:24:48 +0200 Greg KH wrote: > > > > > > > > On Mon, Jul 27, 2020 at 06:08:31PM +1000, Stephen Rothwell wrote: > > > > > Hi all, > > > > > > > > > > After merging the char-misc tree, today's linux-next build (x86_64 > > > > > allmodconfig) failed like this: > > > > > > > > > > In file included from drivers/misc/habanalabs/goya/goya.c:8: > > > > > drivers/misc/habanalabs/goya/goyaP.h:12:10: fatal error: > > > > > habanalabs.h: No such file or directory > > > > >12 | #include "habanalabs.h" > > > > > | ^~ > > > > > In file included from drivers/misc/habanalabs/goya/goya_security.c:8: > > > > > drivers/misc/habanalabs/goya/goyaP.h:12:10: fatal error: > > > > > habanalabs.h: No such file or directory > > > > >12 | #include "habanalabs.h" > > > > > | ^~ > > > > > > > > > > Presumably caused by commit > > > > > > > > > > 70b2f993ea4a ("habanalabs: create common folder") > > > > > > > > > > I have used the char-misc tree from next-20200724 for today. > > > > > > > > Ugh, this is a mess of a merge with this driver. > > > > > > > > Oded, I'll take Stephen's merge resolutions here and push out a new > > > > version, and try to resolve this error, but if you could verify I got it > > > > correct, that would be great. > > > > > > The conflicts are gone, but I still get these errors. > > > > Very odd, I can not duplicate this at all here. I just did a clean > > checkout of the char-misc-next branch and a full 'make allmodconfig' for > > x86_64, and it worked just fine. > > > > Are you sure it's not coming from some other tree? > > Do you build with a separate object tree? I always use make O=... > which makes the difference. I tested with just your tree. Ah, no, I do not. Odd, let me see what kind of crazy they are doing with include build directives... thanks for the hint. greg k-h
Re: linux-next: build failure after merge of the char-misc tree
Hi Greg, On Tue, 28 Jul 2020 09:53:36 +0200 Greg KH wrote: > > On Tue, Jul 28, 2020 at 05:33:31PM +1000, Stephen Rothwell wrote: > > Hi Greg, > > > > On Mon, 27 Jul 2020 11:24:48 +0200 Greg KH wrote: > > > > > > On Mon, Jul 27, 2020 at 06:08:31PM +1000, Stephen Rothwell wrote: > > > > Hi all, > > > > > > > > After merging the char-misc tree, today's linux-next build (x86_64 > > > > allmodconfig) failed like this: > > > > > > > > In file included from drivers/misc/habanalabs/goya/goya.c:8: > > > > drivers/misc/habanalabs/goya/goyaP.h:12:10: fatal error: habanalabs.h: > > > > No such file or directory > > > >12 | #include "habanalabs.h" > > > > | ^~ > > > > In file included from drivers/misc/habanalabs/goya/goya_security.c:8: > > > > drivers/misc/habanalabs/goya/goyaP.h:12:10: fatal error: habanalabs.h: > > > > No such file or directory > > > >12 | #include "habanalabs.h" > > > > | ^~ > > > > > > > > Presumably caused by commit > > > > > > > > 70b2f993ea4a ("habanalabs: create common folder") > > > > > > > > I have used the char-misc tree from next-20200724 for today. > > > > > > Ugh, this is a mess of a merge with this driver. > > > > > > Oded, I'll take Stephen's merge resolutions here and push out a new > > > version, and try to resolve this error, but if you could verify I got it > > > correct, that would be great. > > > > The conflicts are gone, but I still get these errors. > > Very odd, I can not duplicate this at all here. I just did a clean > checkout of the char-misc-next branch and a full 'make allmodconfig' for > x86_64, and it worked just fine. > > Are you sure it's not coming from some other tree? Do you build with a separate object tree? I always use make O=... which makes the difference. I tested with just your tree. -- Cheers, Stephen Rothwell pgpCDKondsvw_.pgp Description: OpenPGP digital signature
Re: linux-next: build failure after merge of the char-misc tree
On Tue, Jul 28, 2020 at 05:33:31PM +1000, Stephen Rothwell wrote: > Hi Greg, > > On Mon, 27 Jul 2020 11:24:48 +0200 Greg KH wrote: > > > > On Mon, Jul 27, 2020 at 06:08:31PM +1000, Stephen Rothwell wrote: > > > Hi all, > > > > > > After merging the char-misc tree, today's linux-next build (x86_64 > > > allmodconfig) failed like this: > > > > > > In file included from drivers/misc/habanalabs/goya/goya.c:8: > > > drivers/misc/habanalabs/goya/goyaP.h:12:10: fatal error: habanalabs.h: No > > > such file or directory > > >12 | #include "habanalabs.h" > > > | ^~ > > > In file included from drivers/misc/habanalabs/goya/goya_security.c:8: > > > drivers/misc/habanalabs/goya/goyaP.h:12:10: fatal error: habanalabs.h: No > > > such file or directory > > >12 | #include "habanalabs.h" > > > | ^~ > > > > > > Presumably caused by commit > > > > > > 70b2f993ea4a ("habanalabs: create common folder") > > > > > > I have used the char-misc tree from next-20200724 for today. > > > > Ugh, this is a mess of a merge with this driver. > > > > Oded, I'll take Stephen's merge resolutions here and push out a new > > version, and try to resolve this error, but if you could verify I got it > > correct, that would be great. > > The conflicts are gone, but I still get these errors. Very odd, I can not duplicate this at all here. I just did a clean checkout of the char-misc-next branch and a full 'make allmodconfig' for x86_64, and it worked just fine. Are you sure it's not coming from some other tree? thanks, greg k-h
Re: linux-next: build failure after merge of the char-misc tree
Hi Greg, On Mon, 27 Jul 2020 11:24:48 +0200 Greg KH wrote: > > On Mon, Jul 27, 2020 at 06:08:31PM +1000, Stephen Rothwell wrote: > > Hi all, > > > > After merging the char-misc tree, today's linux-next build (x86_64 > > allmodconfig) failed like this: > > > > In file included from drivers/misc/habanalabs/goya/goya.c:8: > > drivers/misc/habanalabs/goya/goyaP.h:12:10: fatal error: habanalabs.h: No > > such file or directory > >12 | #include "habanalabs.h" > > | ^~ > > In file included from drivers/misc/habanalabs/goya/goya_security.c:8: > > drivers/misc/habanalabs/goya/goyaP.h:12:10: fatal error: habanalabs.h: No > > such file or directory > >12 | #include "habanalabs.h" > > | ^~ > > > > Presumably caused by commit > > > > 70b2f993ea4a ("habanalabs: create common folder") > > > > I have used the char-misc tree from next-20200724 for today. > > Ugh, this is a mess of a merge with this driver. > > Oded, I'll take Stephen's merge resolutions here and push out a new > version, and try to resolve this error, but if you could verify I got it > correct, that would be great. The conflicts are gone, but I still get these errors. -- Cheers, Stephen Rothwell pgpRa6uHWZval.pgp Description: OpenPGP digital signature
Re: linux-next: build failure after merge of the char-misc tree
On Mon, Jul 27, 2020 at 1:05 PM Greg KH wrote: > > On Mon, Jul 27, 2020 at 12:28:14PM +0300, Oded Gabbay wrote: > > On Mon, Jul 27, 2020 at 12:24 PM Greg KH wrote: > > > > > > On Mon, Jul 27, 2020 at 06:08:31PM +1000, Stephen Rothwell wrote: > > > > Hi all, > > > > > > > > After merging the char-misc tree, today's linux-next build (x86_64 > > > > allmodconfig) failed like this: > > > > > > > > In file included from drivers/misc/habanalabs/goya/goya.c:8: > > > > drivers/misc/habanalabs/goya/goyaP.h:12:10: fatal error: habanalabs.h: > > > > No such file or directory > > > >12 | #include "habanalabs.h" > > > > | ^~ > > > > In file included from drivers/misc/habanalabs/goya/goya_security.c:8: > > > > drivers/misc/habanalabs/goya/goyaP.h:12:10: fatal error: habanalabs.h: > > > > No such file or directory > > > >12 | #include "habanalabs.h" > > > > | ^~ > > > > > > > > Presumably caused by commit > > > > > > > > 70b2f993ea4a ("habanalabs: create common folder") > > > > > > > > I have used the char-misc tree from next-20200724 for today. > > > > > > Ugh, this is a mess of a merge with this driver. > > > > > > Oded, I'll take Stephen's merge resolutions here and push out a new > > > version, and try to resolve this error, but if you could verify I got it > > > correct, that would be great. > > > > > > thanks, > > > > > > greg k-h > > > > Sure, np. Just point me where to look. > > I didn't see the above build issue, but maybe I didn't have the right > configuration options enabled for my build. > > Oded, I've done the merge and pushed it out to my char-misc-next branch, > let me know if I've messed anything up there. > > thanks, > > greg k-h Looks good, thanks! Oded
Re: linux-next: build failure after merge of the char-misc tree
On Mon, Jul 27, 2020 at 12:28:14PM +0300, Oded Gabbay wrote: > On Mon, Jul 27, 2020 at 12:24 PM Greg KH wrote: > > > > On Mon, Jul 27, 2020 at 06:08:31PM +1000, Stephen Rothwell wrote: > > > Hi all, > > > > > > After merging the char-misc tree, today's linux-next build (x86_64 > > > allmodconfig) failed like this: > > > > > > In file included from drivers/misc/habanalabs/goya/goya.c:8: > > > drivers/misc/habanalabs/goya/goyaP.h:12:10: fatal error: habanalabs.h: No > > > such file or directory > > >12 | #include "habanalabs.h" > > > | ^~ > > > In file included from drivers/misc/habanalabs/goya/goya_security.c:8: > > > drivers/misc/habanalabs/goya/goyaP.h:12:10: fatal error: habanalabs.h: No > > > such file or directory > > >12 | #include "habanalabs.h" > > > | ^~ > > > > > > Presumably caused by commit > > > > > > 70b2f993ea4a ("habanalabs: create common folder") > > > > > > I have used the char-misc tree from next-20200724 for today. > > > > Ugh, this is a mess of a merge with this driver. > > > > Oded, I'll take Stephen's merge resolutions here and push out a new > > version, and try to resolve this error, but if you could verify I got it > > correct, that would be great. > > > > thanks, > > > > greg k-h > > Sure, np. Just point me where to look. I didn't see the above build issue, but maybe I didn't have the right configuration options enabled for my build. Oded, I've done the merge and pushed it out to my char-misc-next branch, let me know if I've messed anything up there. thanks, greg k-h
Re: linux-next: build failure after merge of the char-misc tree
On Mon, Jul 27, 2020 at 12:24 PM Greg KH wrote: > > On Mon, Jul 27, 2020 at 06:08:31PM +1000, Stephen Rothwell wrote: > > Hi all, > > > > After merging the char-misc tree, today's linux-next build (x86_64 > > allmodconfig) failed like this: > > > > In file included from drivers/misc/habanalabs/goya/goya.c:8: > > drivers/misc/habanalabs/goya/goyaP.h:12:10: fatal error: habanalabs.h: No > > such file or directory > >12 | #include "habanalabs.h" > > | ^~ > > In file included from drivers/misc/habanalabs/goya/goya_security.c:8: > > drivers/misc/habanalabs/goya/goyaP.h:12:10: fatal error: habanalabs.h: No > > such file or directory > >12 | #include "habanalabs.h" > > | ^~ > > > > Presumably caused by commit > > > > 70b2f993ea4a ("habanalabs: create common folder") > > > > I have used the char-misc tree from next-20200724 for today. > > Ugh, this is a mess of a merge with this driver. > > Oded, I'll take Stephen's merge resolutions here and push out a new > version, and try to resolve this error, but if you could verify I got it > correct, that would be great. > > thanks, > > greg k-h Sure, np. Just point me where to look. Oded
Re: linux-next: build failure after merge of the char-misc tree
On Mon, Jul 27, 2020 at 06:08:31PM +1000, Stephen Rothwell wrote: > Hi all, > > After merging the char-misc tree, today's linux-next build (x86_64 > allmodconfig) failed like this: > > In file included from drivers/misc/habanalabs/goya/goya.c:8: > drivers/misc/habanalabs/goya/goyaP.h:12:10: fatal error: habanalabs.h: No > such file or directory >12 | #include "habanalabs.h" > | ^~ > In file included from drivers/misc/habanalabs/goya/goya_security.c:8: > drivers/misc/habanalabs/goya/goyaP.h:12:10: fatal error: habanalabs.h: No > such file or directory >12 | #include "habanalabs.h" > | ^~ > > Presumably caused by commit > > 70b2f993ea4a ("habanalabs: create common folder") > > I have used the char-misc tree from next-20200724 for today. Ugh, this is a mess of a merge with this driver. Oded, I'll take Stephen's merge resolutions here and push out a new version, and try to resolve this error, but if you could verify I got it correct, that would be great. thanks, greg k-h
linux-next: build failure after merge of the char-misc tree
Hi all, After merging the char-misc tree, today's linux-next build (x86_64 allmodconfig) failed like this: In file included from drivers/misc/habanalabs/goya/goya.c:8: drivers/misc/habanalabs/goya/goyaP.h:12:10: fatal error: habanalabs.h: No such file or directory 12 | #include "habanalabs.h" | ^~ In file included from drivers/misc/habanalabs/goya/goya_security.c:8: drivers/misc/habanalabs/goya/goyaP.h:12:10: fatal error: habanalabs.h: No such file or directory 12 | #include "habanalabs.h" | ^~ Presumably caused by commit 70b2f993ea4a ("habanalabs: create common folder") I have used the char-misc tree from next-20200724 for today. -- Cheers, Stephen Rothwell pgpwzGqz0jiDC.pgp Description: OpenPGP digital signature
Re: linux-next: build failure after merge of the char-misc tree
On Mon, May 04, 2020 at 07:05:50AM +, Rajan Vaja wrote: > Hi Greg, A: Because it messes up the order in which people normally read text. Q: Why is top-posting such a bad thing? A: Top-posting. Q: What is the most annoying thing in e-mail? A: No. Q: Should I include quotations after my reply? http://daringfireball.net/2007/07/on_top > Nathan Chancellor have already submitted > patch "[PATCH] firmware: xilinx: Export > zynqmp_pm_fpga_{get_status,load}". Will you take it directly or should > I merge this change in my patch series and submit a new series? I just merged that patch a few minutes ago, no need to do anything. I will note that this is the 2nd problem in this patch series that was found. I had to drop this series previously for these same types of issues, which I thought were fixed this time. I think you all need to do a bit more build testing on your end when submitting patches please. thanks, greg k-h
Re: linux-next: build failure after merge of the char-misc tree
On Mon, May 04, 2020 at 11:47:56AM +1000, Stephen Rothwell wrote: > Hi all, > > [Just adding cc] > > On Mon, 4 May 2020 11:46:25 +1000 Stephen Rothwell > wrote: > > > > Hi all, > > > > After merging the char-misc tree, Friday's linux-next build (arm64 > > allmodconfig) failed like this: > > > > ERROR: modpost: "zynqmp_pm_fpga_get_status" [drivers/fpga/zynqmp-fpga.ko] > > undefined! > > ERROR: modpost: "zynqmp_pm_fpga_load" [drivers/fpga/zynqmp-fpga.ko] > > undefined! > > > > Presumably caused by commit > > > > 4db8180ffe7c ("firmware: xilinx: Remove eemi ops for fpga related APIs") > > > > Reported-by: "kernelci.org bot" Nathan sent me a patch for this on Friday, sorry I missed it. I'll queue it up now, thanks. greg k-h
Re: linux-next: build failure after merge of the char-misc tree
Hi all, [Just adding cc] On Mon, 4 May 2020 11:46:25 +1000 Stephen Rothwell wrote: > > Hi all, > > After merging the char-misc tree, Friday's linux-next build (arm64 > allmodconfig) failed like this: > > ERROR: modpost: "zynqmp_pm_fpga_get_status" [drivers/fpga/zynqmp-fpga.ko] > undefined! > ERROR: modpost: "zynqmp_pm_fpga_load" [drivers/fpga/zynqmp-fpga.ko] undefined! > > Presumably caused by commit > > 4db8180ffe7c ("firmware: xilinx: Remove eemi ops for fpga related APIs") > > Reported-by: "kernelci.org bot" -- Cheers, Stephen Rothwell pgp7jaIlC_xF_.pgp Description: OpenPGP digital signature
linux-next: build failure after merge of the char-misc tree
Hi all, After merging the char-misc tree, Friday's linux-next build (arm64 allmodconfig) failed like this: ERROR: modpost: "zynqmp_pm_fpga_get_status" [drivers/fpga/zynqmp-fpga.ko] undefined! ERROR: modpost: "zynqmp_pm_fpga_load" [drivers/fpga/zynqmp-fpga.ko] undefined! Presumably caused by commit 4db8180ffe7c ("firmware: xilinx: Remove eemi ops for fpga related APIs") Reported-by: "kernelci.org bot" -- Cheers, Stephen Rothwell pgp5niOiI4HDj.pgp Description: OpenPGP digital signature
Re: linux-next: build failure after merge of the char-misc tree
On Fri, Jul 12, 2019 at 10:44:30AM +1000, Stephen Rothwell wrote: > Hi all, > > On Mon, 8 Jul 2019 19:23:45 +1000 Stephen Rothwell > wrote: > > > > After merging the char-misc tree, today's linux-next build (x86_64 > > allmodconfig) failed like this: > > > > drivers/misc/vmw_balloon.c: In function 'vmballoon_mount': > > drivers/misc/vmw_balloon.c:1736:14: error: 'simple_dname' undeclared (first > > use in this function); did you mean 'simple_rename'? > >.d_dname = simple_dname, > > ^~~~ > > simple_rename > > drivers/misc/vmw_balloon.c:1736:14: note: each undeclared identifier is > > reported only once for each function it appears in > > drivers/misc/vmw_balloon.c:1739:9: error: implicit declaration of function > > 'mount_pseudo'; did you mean 'mount_bdev'? > > [-Werror=implicit-function-declaration] > > return mount_pseudo(fs_type, "balloon-vmware:", NULL, , > > ^~~~ > > mount_bdev > > drivers/misc/vmw_balloon.c:1739:9: warning: returning 'int' from a function > > with return type 'struct dentry *' makes pointer from integer without a > > cast [-Wint-conversion] > > return mount_pseudo(fs_type, "balloon-vmware:", NULL, , > > ^~~~ > > BALLOON_VMW_MAGIC); > > ~~ > > > > Caused by commit > > > > 83a8afa72e9c ("vmw_balloon: Compaction support") > > > > interacting with commits > > > > 7e5f7bb08b8c ("unexport simple_dname()") > > 8d9e46d80777 ("fold mount_pseudo_xattr() into pseudo_fs_get_tree()") > > > > from the vfs tree. > > > > I applied the following merge fix patch: > > > > From: Stephen Rothwell > > Date: Mon, 8 Jul 2019 19:17:56 +1000 > > Subject: [PATCH] convert vmwballoon to use the new mount API > > > > Signed-off-by: Stephen Rothwell > > --- > > drivers/misc/vmw_balloon.c | 14 -- > > 1 file changed, 4 insertions(+), 10 deletions(-) > > > > diff --git a/drivers/misc/vmw_balloon.c b/drivers/misc/vmw_balloon.c > > index 91fa43051535..e8c0f7525f13 100644 > > --- a/drivers/misc/vmw_balloon.c > > +++ b/drivers/misc/vmw_balloon.c > > @@ -29,6 +29,7 @@ > > #include > > #include > > #include > > +#include > > #include > > #include > > #include > > @@ -1728,21 +1729,14 @@ static inline void vmballoon_debugfs_exit(struct > > vmballoon *b) > > > > #ifdef CONFIG_BALLOON_COMPACTION > > > > -static struct dentry *vmballoon_mount(struct file_system_type *fs_type, > > - int flags, const char *dev_name, > > - void *data) > > +static int vmballoon_init_fs_context(struct fs_context *fc) > > { > > - static const struct dentry_operations ops = { > > - .d_dname = simple_dname, > > - }; > > - > > - return mount_pseudo(fs_type, "balloon-vmware:", NULL, , > > - BALLOON_VMW_MAGIC); > > + return init_pseudo(fc, BALLOON_VMW_MAGIC) ? 0 : -ENOMEM; > > } > > > > static struct file_system_type vmballoon_fs = { > > .name = "balloon-vmware", > > - .mount = vmballoon_mount, > > + .init_fs_context = vmballoon_init_fs_context, > > .kill_sb= kill_anon_super, > > }; > > > > This is now a conflict between the vfs tree and Linus' tree. Looks good to me, I'll watch out for this when Al's tree is merged. thanks, greg k-h
Re: linux-next: build failure after merge of the char-misc tree
Hi all, On Mon, 8 Jul 2019 19:23:45 +1000 Stephen Rothwell wrote: > > After merging the char-misc tree, today's linux-next build (x86_64 > allmodconfig) failed like this: > > drivers/misc/vmw_balloon.c: In function 'vmballoon_mount': > drivers/misc/vmw_balloon.c:1736:14: error: 'simple_dname' undeclared (first > use in this function); did you mean 'simple_rename'? >.d_dname = simple_dname, > ^~~~ > simple_rename > drivers/misc/vmw_balloon.c:1736:14: note: each undeclared identifier is > reported only once for each function it appears in > drivers/misc/vmw_balloon.c:1739:9: error: implicit declaration of function > 'mount_pseudo'; did you mean 'mount_bdev'? > [-Werror=implicit-function-declaration] > return mount_pseudo(fs_type, "balloon-vmware:", NULL, , > ^~~~ > mount_bdev > drivers/misc/vmw_balloon.c:1739:9: warning: returning 'int' from a function > with return type 'struct dentry *' makes pointer from integer without a cast > [-Wint-conversion] > return mount_pseudo(fs_type, "balloon-vmware:", NULL, , > ^~~~ > BALLOON_VMW_MAGIC); > ~~ > > Caused by commit > > 83a8afa72e9c ("vmw_balloon: Compaction support") > > interacting with commits > > 7e5f7bb08b8c ("unexport simple_dname()") > 8d9e46d80777 ("fold mount_pseudo_xattr() into pseudo_fs_get_tree()") > > from the vfs tree. > > I applied the following merge fix patch: > > From: Stephen Rothwell > Date: Mon, 8 Jul 2019 19:17:56 +1000 > Subject: [PATCH] convert vmwballoon to use the new mount API > > Signed-off-by: Stephen Rothwell > --- > drivers/misc/vmw_balloon.c | 14 -- > 1 file changed, 4 insertions(+), 10 deletions(-) > > diff --git a/drivers/misc/vmw_balloon.c b/drivers/misc/vmw_balloon.c > index 91fa43051535..e8c0f7525f13 100644 > --- a/drivers/misc/vmw_balloon.c > +++ b/drivers/misc/vmw_balloon.c > @@ -29,6 +29,7 @@ > #include > #include > #include > +#include > #include > #include > #include > @@ -1728,21 +1729,14 @@ static inline void vmballoon_debugfs_exit(struct > vmballoon *b) > > #ifdef CONFIG_BALLOON_COMPACTION > > -static struct dentry *vmballoon_mount(struct file_system_type *fs_type, > - int flags, const char *dev_name, > - void *data) > +static int vmballoon_init_fs_context(struct fs_context *fc) > { > - static const struct dentry_operations ops = { > - .d_dname = simple_dname, > - }; > - > - return mount_pseudo(fs_type, "balloon-vmware:", NULL, , > - BALLOON_VMW_MAGIC); > + return init_pseudo(fc, BALLOON_VMW_MAGIC) ? 0 : -ENOMEM; > } > > static struct file_system_type vmballoon_fs = { > .name = "balloon-vmware", > - .mount = vmballoon_mount, > + .init_fs_context = vmballoon_init_fs_context, > .kill_sb= kill_anon_super, > }; > This is now a conflict between the vfs tree and Linus' tree. -- Cheers, Stephen Rothwell pgpmLDhHj_Ebr.pgp Description: OpenPGP digital signature
linux-next: build failure after merge of the char-misc tree
Hi all, After merging the char-misc tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/misc/vmw_balloon.c: In function 'vmballoon_mount': drivers/misc/vmw_balloon.c:1736:14: error: 'simple_dname' undeclared (first use in this function); did you mean 'simple_rename'? .d_dname = simple_dname, ^~~~ simple_rename drivers/misc/vmw_balloon.c:1736:14: note: each undeclared identifier is reported only once for each function it appears in drivers/misc/vmw_balloon.c:1739:9: error: implicit declaration of function 'mount_pseudo'; did you mean 'mount_bdev'? [-Werror=implicit-function-declaration] return mount_pseudo(fs_type, "balloon-vmware:", NULL, , ^~~~ mount_bdev drivers/misc/vmw_balloon.c:1739:9: warning: returning 'int' from a function with return type 'struct dentry *' makes pointer from integer without a cast [-Wint-conversion] return mount_pseudo(fs_type, "balloon-vmware:", NULL, , ^~~~ BALLOON_VMW_MAGIC); ~~ Caused by commit 83a8afa72e9c ("vmw_balloon: Compaction support") interacting with commits 7e5f7bb08b8c ("unexport simple_dname()") 8d9e46d80777 ("fold mount_pseudo_xattr() into pseudo_fs_get_tree()") from the vfs tree. I applied the following merge fix patch: From: Stephen Rothwell Date: Mon, 8 Jul 2019 19:17:56 +1000 Subject: [PATCH] convert vmwballoon to use the new mount API Signed-off-by: Stephen Rothwell --- drivers/misc/vmw_balloon.c | 14 -- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/drivers/misc/vmw_balloon.c b/drivers/misc/vmw_balloon.c index 91fa43051535..e8c0f7525f13 100644 --- a/drivers/misc/vmw_balloon.c +++ b/drivers/misc/vmw_balloon.c @@ -29,6 +29,7 @@ #include #include #include +#include #include #include #include @@ -1728,21 +1729,14 @@ static inline void vmballoon_debugfs_exit(struct vmballoon *b) #ifdef CONFIG_BALLOON_COMPACTION -static struct dentry *vmballoon_mount(struct file_system_type *fs_type, - int flags, const char *dev_name, - void *data) +static int vmballoon_init_fs_context(struct fs_context *fc) { - static const struct dentry_operations ops = { - .d_dname = simple_dname, - }; - - return mount_pseudo(fs_type, "balloon-vmware:", NULL, , - BALLOON_VMW_MAGIC); + return init_pseudo(fc, BALLOON_VMW_MAGIC) ? 0 : -ENOMEM; } static struct file_system_type vmballoon_fs = { .name = "balloon-vmware", - .mount = vmballoon_mount, + .init_fs_context = vmballoon_init_fs_context, .kill_sb= kill_anon_super, }; -- 2.20.1 -- Cheers, Stephen Rothwell pgp2Jn1rMaTta.pgp Description: OpenPGP digital signature
Re: linux-next: build failure after merge of the char-misc tree
On Wed, Apr 12, 2017 at 03:18:59PM +1000, Stephen Rothwell wrote: > Hi all, > > After merging the char-misc tree, today's linux-next build (x86_64 > allmodconfig) failed like this: > > In file included from drivers/firmware/google/memconsole-x86-legacy.c:23:0: > arch/x86/include/uapi/asm/e820.h:66:23: error: 'E820_X_MAX' undeclared here > (not in a function) > struct e820entry map[E820_X_MAX]; >^ > > Caused by commit > > afe9dba4f9ae ("firmware: google memconsole: Move specific EBDA parts") > > interacting with commit > > 66441bd3cfdc ("x86/boot/e820: Move asm/e820.h to asm/e820/api.h") > > from the tip tree. > > I applied the following merge fix patch: > > From: Stephen Rothwell> Date: Wed, 12 Apr 2017 15:12:12 +1000 > Subject: [PATCH] firmware: google memconsole: merge fix for e820.h move > > Signed-off-by: Stephen Rothwell > --- > drivers/firmware/google/memconsole-x86-legacy.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/firmware/google/memconsole-x86-legacy.c > b/drivers/firmware/google/memconsole-x86-legacy.c > index 529078c62488..99df2749c4c5 100644 > --- a/drivers/firmware/google/memconsole-x86-legacy.c > +++ b/drivers/firmware/google/memconsole-x86-legacy.c > @@ -20,7 +20,7 @@ > #include > #include > #include > -#include > +#include > #include > > #include "memconsole.h" > -- > 2.11.0 Thanks for the patch, I'll keep it around for when things get merged to Linus if needed. greg k-h
Re: linux-next: build failure after merge of the char-misc tree
On Wed, Apr 12, 2017 at 03:18:59PM +1000, Stephen Rothwell wrote: > Hi all, > > After merging the char-misc tree, today's linux-next build (x86_64 > allmodconfig) failed like this: > > In file included from drivers/firmware/google/memconsole-x86-legacy.c:23:0: > arch/x86/include/uapi/asm/e820.h:66:23: error: 'E820_X_MAX' undeclared here > (not in a function) > struct e820entry map[E820_X_MAX]; >^ > > Caused by commit > > afe9dba4f9ae ("firmware: google memconsole: Move specific EBDA parts") > > interacting with commit > > 66441bd3cfdc ("x86/boot/e820: Move asm/e820.h to asm/e820/api.h") > > from the tip tree. > > I applied the following merge fix patch: > > From: Stephen Rothwell > Date: Wed, 12 Apr 2017 15:12:12 +1000 > Subject: [PATCH] firmware: google memconsole: merge fix for e820.h move > > Signed-off-by: Stephen Rothwell > --- > drivers/firmware/google/memconsole-x86-legacy.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/firmware/google/memconsole-x86-legacy.c > b/drivers/firmware/google/memconsole-x86-legacy.c > index 529078c62488..99df2749c4c5 100644 > --- a/drivers/firmware/google/memconsole-x86-legacy.c > +++ b/drivers/firmware/google/memconsole-x86-legacy.c > @@ -20,7 +20,7 @@ > #include > #include > #include > -#include > +#include > #include > > #include "memconsole.h" > -- > 2.11.0 Thanks for the patch, I'll keep it around for when things get merged to Linus if needed. greg k-h
linux-next: build failure after merge of the char-misc tree
Hi all, After merging the char-misc tree, today's linux-next build (x86_64 allmodconfig) failed like this: In file included from drivers/firmware/google/memconsole-x86-legacy.c:23:0: arch/x86/include/uapi/asm/e820.h:66:23: error: 'E820_X_MAX' undeclared here (not in a function) struct e820entry map[E820_X_MAX]; ^ Caused by commit afe9dba4f9ae ("firmware: google memconsole: Move specific EBDA parts") interacting with commit 66441bd3cfdc ("x86/boot/e820: Move asm/e820.h to asm/e820/api.h") from the tip tree. I applied the following merge fix patch: From: Stephen RothwellDate: Wed, 12 Apr 2017 15:12:12 +1000 Subject: [PATCH] firmware: google memconsole: merge fix for e820.h move Signed-off-by: Stephen Rothwell --- drivers/firmware/google/memconsole-x86-legacy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/firmware/google/memconsole-x86-legacy.c b/drivers/firmware/google/memconsole-x86-legacy.c index 529078c62488..99df2749c4c5 100644 --- a/drivers/firmware/google/memconsole-x86-legacy.c +++ b/drivers/firmware/google/memconsole-x86-legacy.c @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include "memconsole.h" -- 2.11.0 -- Cheers, Stephen Rothwell
linux-next: build failure after merge of the char-misc tree
Hi all, After merging the char-misc tree, today's linux-next build (x86_64 allmodconfig) failed like this: In file included from drivers/firmware/google/memconsole-x86-legacy.c:23:0: arch/x86/include/uapi/asm/e820.h:66:23: error: 'E820_X_MAX' undeclared here (not in a function) struct e820entry map[E820_X_MAX]; ^ Caused by commit afe9dba4f9ae ("firmware: google memconsole: Move specific EBDA parts") interacting with commit 66441bd3cfdc ("x86/boot/e820: Move asm/e820.h to asm/e820/api.h") from the tip tree. I applied the following merge fix patch: From: Stephen Rothwell Date: Wed, 12 Apr 2017 15:12:12 +1000 Subject: [PATCH] firmware: google memconsole: merge fix for e820.h move Signed-off-by: Stephen Rothwell --- drivers/firmware/google/memconsole-x86-legacy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/firmware/google/memconsole-x86-legacy.c b/drivers/firmware/google/memconsole-x86-legacy.c index 529078c62488..99df2749c4c5 100644 --- a/drivers/firmware/google/memconsole-x86-legacy.c +++ b/drivers/firmware/google/memconsole-x86-legacy.c @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include "memconsole.h" -- 2.11.0 -- Cheers, Stephen Rothwell
Re: linux-next: build failure after merge of the char-misc tree
On Tue, Mar 21, 2017 at 11:06 AM, Cyril Burwrote: > On Tue, 2017-03-21 at 11:18 +1100, Benjamin Herrenschmidt wrote: >> On Mon, 2017-03-20 at 13:23 +0100, Arnd Bergmann wrote: >> > On Mon, Mar 20, 2017 at 3:44 AM, Stephen Rothwell >> > wrote: >> > > Hi all, >> > > >> > > After merging the char-misc tree, today's linux-next build (x86_64 >> > > allmodconfig) failed like this: >> > > >> > > drivers/misc/aspeed-lpc-ctrl.c: In function 'aspeed_lpc_ctrl_mmap': >> > > drivers/misc/aspeed-lpc-ctrl.c:51:9: error: implicit declaration of >> > > function 'pgprot_dmacoherent' [-Werror=implicit-function-declaration] >> > > prot = pgprot_dmacoherent(prot); >> > >> > A lot of other drivers (including /dev/mem) just use pgprot_noncached() or >> > pgprot_writecombine(), which would make the code portable and might be >> > what you want here as well. >> > >> > pgprot_dmacoherent() is meant specifically for mapping RAM that is used >> > for DMA buffers that come from dma_alloc_coherent(), which doesn't seem >> > to be the case here. >> > >> > What kind of address range is this really? >> >> It's a piece of RAM that we reserve via a reserved region, which will >> be accessed by HW (sort-of-DMA, ie, the "host" system will access that >> using FW cycles on the LPC bus which we map to that reserved region of >> memory). >> >> Joel, Cyril, can you send a 1-liner patch to change that to >> pgprot_noncached() ? >> > > Sure. Just to be clear - we want to keep COMPILE_TEST in kconfig? Yep. With the change that Ben suggested we should be ok. pgprot_noncached has a fall back definition in include/asm-generic/pgtable.h, so all platforms will compile. Cheers, Joel
Re: linux-next: build failure after merge of the char-misc tree
On Tue, Mar 21, 2017 at 11:06 AM, Cyril Bur wrote: > On Tue, 2017-03-21 at 11:18 +1100, Benjamin Herrenschmidt wrote: >> On Mon, 2017-03-20 at 13:23 +0100, Arnd Bergmann wrote: >> > On Mon, Mar 20, 2017 at 3:44 AM, Stephen Rothwell >> > wrote: >> > > Hi all, >> > > >> > > After merging the char-misc tree, today's linux-next build (x86_64 >> > > allmodconfig) failed like this: >> > > >> > > drivers/misc/aspeed-lpc-ctrl.c: In function 'aspeed_lpc_ctrl_mmap': >> > > drivers/misc/aspeed-lpc-ctrl.c:51:9: error: implicit declaration of >> > > function 'pgprot_dmacoherent' [-Werror=implicit-function-declaration] >> > > prot = pgprot_dmacoherent(prot); >> > >> > A lot of other drivers (including /dev/mem) just use pgprot_noncached() or >> > pgprot_writecombine(), which would make the code portable and might be >> > what you want here as well. >> > >> > pgprot_dmacoherent() is meant specifically for mapping RAM that is used >> > for DMA buffers that come from dma_alloc_coherent(), which doesn't seem >> > to be the case here. >> > >> > What kind of address range is this really? >> >> It's a piece of RAM that we reserve via a reserved region, which will >> be accessed by HW (sort-of-DMA, ie, the "host" system will access that >> using FW cycles on the LPC bus which we map to that reserved region of >> memory). >> >> Joel, Cyril, can you send a 1-liner patch to change that to >> pgprot_noncached() ? >> > > Sure. Just to be clear - we want to keep COMPILE_TEST in kconfig? Yep. With the change that Ben suggested we should be ok. pgprot_noncached has a fall back definition in include/asm-generic/pgtable.h, so all platforms will compile. Cheers, Joel
Re: linux-next: build failure after merge of the char-misc tree
On Tue, 2017-03-21 at 11:18 +1100, Benjamin Herrenschmidt wrote: > On Mon, 2017-03-20 at 13:23 +0100, Arnd Bergmann wrote: > > On Mon, Mar 20, 2017 at 3:44 AM, Stephen Rothwell> > wrote: > > > Hi all, > > > > > > After merging the char-misc tree, today's linux-next build (x86_64 > > > allmodconfig) failed like this: > > > > > > drivers/misc/aspeed-lpc-ctrl.c: In function 'aspeed_lpc_ctrl_mmap': > > > drivers/misc/aspeed-lpc-ctrl.c:51:9: error: implicit declaration of > > > function 'pgprot_dmacoherent' [-Werror=implicit-function-declaration] > > > prot = pgprot_dmacoherent(prot); > > > > A lot of other drivers (including /dev/mem) just use pgprot_noncached() or > > pgprot_writecombine(), which would make the code portable and might be > > what you want here as well. > > > > pgprot_dmacoherent() is meant specifically for mapping RAM that is used > > for DMA buffers that come from dma_alloc_coherent(), which doesn't seem > > to be the case here. > > > > What kind of address range is this really? > > It's a piece of RAM that we reserve via a reserved region, which will > be accessed by HW (sort-of-DMA, ie, the "host" system will access that > using FW cycles on the LPC bus which we map to that reserved region of > memory). > > Joel, Cyril, can you send a 1-liner patch to change that to > pgprot_noncached() ? > Sure. Just to be clear - we want to keep COMPILE_TEST in kconfig? Also I can't help but notice this: https://lists.ozlabs.org/pipermail/openbmc/2017-January/006219.html [v3 of the series] vs https://lists.ozlabs.org/pipermail/openbmc/2017-February/006462.html [v4 of the series] > Cheers, > Ben. > > > > drivers/misc/aspeed-lpc-ctrl.c:51:7: error: incompatible types when > > > assigning to type 'pgprot_t {aka struct pgprot}' from type 'int' > > > prot = pgprot_dmacoherent(prot); > > > ^ > > > In file included from include/linux/miscdevice.h:6:0, > > > from drivers/misc/aspeed-lpc-ctrl.c:11: > > > drivers/misc/aspeed-lpc-ctrl.c: In function 'aspeed_lpc_ctrl_probe': > > > drivers/misc/aspeed-lpc-ctrl.c:232:17: warning: format '%x' expects > > > argument of type 'unsigned int', but argument 3 has type 'phys_addr_t > > > {aka long long unsigned int}' [-Wformat=] > > > dev_info(dev, "Loaded at 0x%08x (0x%08x)\n", > > > > This should just use the "%pap" for printing a phys_addr_t, otherwise we > > get the same warning on ARM in some configurations. Thanks Arnd, I'll address that too. > > > > Arnd
Re: linux-next: build failure after merge of the char-misc tree
On Tue, 2017-03-21 at 11:18 +1100, Benjamin Herrenschmidt wrote: > On Mon, 2017-03-20 at 13:23 +0100, Arnd Bergmann wrote: > > On Mon, Mar 20, 2017 at 3:44 AM, Stephen Rothwell > > wrote: > > > Hi all, > > > > > > After merging the char-misc tree, today's linux-next build (x86_64 > > > allmodconfig) failed like this: > > > > > > drivers/misc/aspeed-lpc-ctrl.c: In function 'aspeed_lpc_ctrl_mmap': > > > drivers/misc/aspeed-lpc-ctrl.c:51:9: error: implicit declaration of > > > function 'pgprot_dmacoherent' [-Werror=implicit-function-declaration] > > > prot = pgprot_dmacoherent(prot); > > > > A lot of other drivers (including /dev/mem) just use pgprot_noncached() or > > pgprot_writecombine(), which would make the code portable and might be > > what you want here as well. > > > > pgprot_dmacoherent() is meant specifically for mapping RAM that is used > > for DMA buffers that come from dma_alloc_coherent(), which doesn't seem > > to be the case here. > > > > What kind of address range is this really? > > It's a piece of RAM that we reserve via a reserved region, which will > be accessed by HW (sort-of-DMA, ie, the "host" system will access that > using FW cycles on the LPC bus which we map to that reserved region of > memory). > > Joel, Cyril, can you send a 1-liner patch to change that to > pgprot_noncached() ? > Sure. Just to be clear - we want to keep COMPILE_TEST in kconfig? Also I can't help but notice this: https://lists.ozlabs.org/pipermail/openbmc/2017-January/006219.html [v3 of the series] vs https://lists.ozlabs.org/pipermail/openbmc/2017-February/006462.html [v4 of the series] > Cheers, > Ben. > > > > drivers/misc/aspeed-lpc-ctrl.c:51:7: error: incompatible types when > > > assigning to type 'pgprot_t {aka struct pgprot}' from type 'int' > > > prot = pgprot_dmacoherent(prot); > > > ^ > > > In file included from include/linux/miscdevice.h:6:0, > > > from drivers/misc/aspeed-lpc-ctrl.c:11: > > > drivers/misc/aspeed-lpc-ctrl.c: In function 'aspeed_lpc_ctrl_probe': > > > drivers/misc/aspeed-lpc-ctrl.c:232:17: warning: format '%x' expects > > > argument of type 'unsigned int', but argument 3 has type 'phys_addr_t > > > {aka long long unsigned int}' [-Wformat=] > > > dev_info(dev, "Loaded at 0x%08x (0x%08x)\n", > > > > This should just use the "%pap" for printing a phys_addr_t, otherwise we > > get the same warning on ARM in some configurations. Thanks Arnd, I'll address that too. > > > > Arnd
Re: linux-next: build failure after merge of the char-misc tree
On Mon, 2017-03-20 at 13:23 +0100, Arnd Bergmann wrote: > On Mon, Mar 20, 2017 at 3:44 AM, Stephen Rothwell> wrote: > > Hi all, > > > > After merging the char-misc tree, today's linux-next build (x86_64 > > allmodconfig) failed like this: > > > > drivers/misc/aspeed-lpc-ctrl.c: In function 'aspeed_lpc_ctrl_mmap': > > drivers/misc/aspeed-lpc-ctrl.c:51:9: error: implicit declaration of > > function 'pgprot_dmacoherent' [-Werror=implicit-function-declaration] > > prot = pgprot_dmacoherent(prot); > > A lot of other drivers (including /dev/mem) just use pgprot_noncached() or > pgprot_writecombine(), which would make the code portable and might be > what you want here as well. > > pgprot_dmacoherent() is meant specifically for mapping RAM that is used > for DMA buffers that come from dma_alloc_coherent(), which doesn't seem > to be the case here. > > What kind of address range is this really? It's a piece of RAM that we reserve via a reserved region, which will be accessed by HW (sort-of-DMA, ie, the "host" system will access that using FW cycles on the LPC bus which we map to that reserved region of memory). Joel, Cyril, can you send a 1-liner patch to change that to pgprot_noncached() ? Cheers, Ben. > > drivers/misc/aspeed-lpc-ctrl.c:51:7: error: incompatible types when > > assigning to type 'pgprot_t {aka struct pgprot}' from type 'int' > > prot = pgprot_dmacoherent(prot); > > ^ > > In file included from include/linux/miscdevice.h:6:0, > > from drivers/misc/aspeed-lpc-ctrl.c:11: > > drivers/misc/aspeed-lpc-ctrl.c: In function 'aspeed_lpc_ctrl_probe': > > drivers/misc/aspeed-lpc-ctrl.c:232:17: warning: format '%x' expects > > argument of type 'unsigned int', but argument 3 has type 'phys_addr_t {aka > > long long unsigned int}' [-Wformat=] > > dev_info(dev, "Loaded at 0x%08x (0x%08x)\n", > > This should just use the "%pap" for printing a phys_addr_t, otherwise we > get the same warning on ARM in some configurations. > > Arnd
Re: linux-next: build failure after merge of the char-misc tree
On Mon, 2017-03-20 at 13:23 +0100, Arnd Bergmann wrote: > On Mon, Mar 20, 2017 at 3:44 AM, Stephen Rothwell > wrote: > > Hi all, > > > > After merging the char-misc tree, today's linux-next build (x86_64 > > allmodconfig) failed like this: > > > > drivers/misc/aspeed-lpc-ctrl.c: In function 'aspeed_lpc_ctrl_mmap': > > drivers/misc/aspeed-lpc-ctrl.c:51:9: error: implicit declaration of > > function 'pgprot_dmacoherent' [-Werror=implicit-function-declaration] > > prot = pgprot_dmacoherent(prot); > > A lot of other drivers (including /dev/mem) just use pgprot_noncached() or > pgprot_writecombine(), which would make the code portable and might be > what you want here as well. > > pgprot_dmacoherent() is meant specifically for mapping RAM that is used > for DMA buffers that come from dma_alloc_coherent(), which doesn't seem > to be the case here. > > What kind of address range is this really? It's a piece of RAM that we reserve via a reserved region, which will be accessed by HW (sort-of-DMA, ie, the "host" system will access that using FW cycles on the LPC bus which we map to that reserved region of memory). Joel, Cyril, can you send a 1-liner patch to change that to pgprot_noncached() ? Cheers, Ben. > > drivers/misc/aspeed-lpc-ctrl.c:51:7: error: incompatible types when > > assigning to type 'pgprot_t {aka struct pgprot}' from type 'int' > > prot = pgprot_dmacoherent(prot); > > ^ > > In file included from include/linux/miscdevice.h:6:0, > > from drivers/misc/aspeed-lpc-ctrl.c:11: > > drivers/misc/aspeed-lpc-ctrl.c: In function 'aspeed_lpc_ctrl_probe': > > drivers/misc/aspeed-lpc-ctrl.c:232:17: warning: format '%x' expects > > argument of type 'unsigned int', but argument 3 has type 'phys_addr_t {aka > > long long unsigned int}' [-Wformat=] > > dev_info(dev, "Loaded at 0x%08x (0x%08x)\n", > > This should just use the "%pap" for printing a phys_addr_t, otherwise we > get the same warning on ARM in some configurations. > > Arnd
Re: linux-next: build failure after merge of the char-misc tree
On Mon, Mar 20, 2017 at 3:44 AM, Stephen Rothwellwrote: > Hi all, > > After merging the char-misc tree, today's linux-next build (x86_64 > allmodconfig) failed like this: > > drivers/misc/aspeed-lpc-ctrl.c: In function 'aspeed_lpc_ctrl_mmap': > drivers/misc/aspeed-lpc-ctrl.c:51:9: error: implicit declaration of function > 'pgprot_dmacoherent' [-Werror=implicit-function-declaration] > prot = pgprot_dmacoherent(prot); A lot of other drivers (including /dev/mem) just use pgprot_noncached() or pgprot_writecombine(), which would make the code portable and might be what you want here as well. pgprot_dmacoherent() is meant specifically for mapping RAM that is used for DMA buffers that come from dma_alloc_coherent(), which doesn't seem to be the case here. What kind of address range is this really? > drivers/misc/aspeed-lpc-ctrl.c:51:7: error: incompatible types when assigning > to type 'pgprot_t {aka struct pgprot}' from type 'int' > prot = pgprot_dmacoherent(prot); >^ > In file included from include/linux/miscdevice.h:6:0, > from drivers/misc/aspeed-lpc-ctrl.c:11: > drivers/misc/aspeed-lpc-ctrl.c: In function 'aspeed_lpc_ctrl_probe': > drivers/misc/aspeed-lpc-ctrl.c:232:17: warning: format '%x' expects argument > of type 'unsigned int', but argument 3 has type 'phys_addr_t {aka long long > unsigned int}' [-Wformat=] >dev_info(dev, "Loaded at 0x%08x (0x%08x)\n", This should just use the "%pap" for printing a phys_addr_t, otherwise we get the same warning on ARM in some configurations. Arnd
Re: linux-next: build failure after merge of the char-misc tree
On Mon, Mar 20, 2017 at 3:44 AM, Stephen Rothwell wrote: > Hi all, > > After merging the char-misc tree, today's linux-next build (x86_64 > allmodconfig) failed like this: > > drivers/misc/aspeed-lpc-ctrl.c: In function 'aspeed_lpc_ctrl_mmap': > drivers/misc/aspeed-lpc-ctrl.c:51:9: error: implicit declaration of function > 'pgprot_dmacoherent' [-Werror=implicit-function-declaration] > prot = pgprot_dmacoherent(prot); A lot of other drivers (including /dev/mem) just use pgprot_noncached() or pgprot_writecombine(), which would make the code portable and might be what you want here as well. pgprot_dmacoherent() is meant specifically for mapping RAM that is used for DMA buffers that come from dma_alloc_coherent(), which doesn't seem to be the case here. What kind of address range is this really? > drivers/misc/aspeed-lpc-ctrl.c:51:7: error: incompatible types when assigning > to type 'pgprot_t {aka struct pgprot}' from type 'int' > prot = pgprot_dmacoherent(prot); >^ > In file included from include/linux/miscdevice.h:6:0, > from drivers/misc/aspeed-lpc-ctrl.c:11: > drivers/misc/aspeed-lpc-ctrl.c: In function 'aspeed_lpc_ctrl_probe': > drivers/misc/aspeed-lpc-ctrl.c:232:17: warning: format '%x' expects argument > of type 'unsigned int', but argument 3 has type 'phys_addr_t {aka long long > unsigned int}' [-Wformat=] >dev_info(dev, "Loaded at 0x%08x (0x%08x)\n", This should just use the "%pap" for printing a phys_addr_t, otherwise we get the same warning on ARM in some configurations. Arnd
linux-next: build failure after merge of the char-misc tree
Hi all, After merging the char-misc tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/misc/aspeed-lpc-ctrl.c: In function 'aspeed_lpc_ctrl_mmap': drivers/misc/aspeed-lpc-ctrl.c:51:9: error: implicit declaration of function 'pgprot_dmacoherent' [-Werror=implicit-function-declaration] prot = pgprot_dmacoherent(prot); ^ drivers/misc/aspeed-lpc-ctrl.c:51:7: error: incompatible types when assigning to type 'pgprot_t {aka struct pgprot}' from type 'int' prot = pgprot_dmacoherent(prot); ^ In file included from include/linux/miscdevice.h:6:0, from drivers/misc/aspeed-lpc-ctrl.c:11: drivers/misc/aspeed-lpc-ctrl.c: In function 'aspeed_lpc_ctrl_probe': drivers/misc/aspeed-lpc-ctrl.c:232:17: warning: format '%x' expects argument of type 'unsigned int', but argument 3 has type 'phys_addr_t {aka long long unsigned int}' [-Wformat=] dev_info(dev, "Loaded at 0x%08x (0x%08x)\n", ^ include/linux/device.h:1317:51: note: in definition of macro 'dev_info' #define dev_info(dev, fmt, arg...) _dev_info(dev, fmt, ##arg) ^ drivers/misc/aspeed-lpc-ctrl.c:232:17: warning: format '%x' expects argument of type 'unsigned int', but argument 4 has type 'resource_size_t {aka long long unsigned int}' [-Wformat=] dev_info(dev, "Loaded at 0x%08x (0x%08x)\n", ^ include/linux/device.h:1317:51: note: in definition of macro 'dev_info' #define dev_info(dev, fmt, arg...) _dev_info(dev, fmt, ##arg) ^ Caused by commit 6c4e97678501 ("drivers/misc: Add Aspeed LPC control driver") Clearly this will only build on arm :-( You can only use COMPILE_TEST if you can reasonably expect the build to work on all architectures and platforms. I have added the following patch for today (the warnings should be fixed as well): From: Stephen RothwellDate: Mon, 20 Mar 2017 13:38:10 +1100 Subject: [PATCH] drivers/misc: Aspeed LPC control driver will only build on arm Signed-off-by: Stephen Rothwell --- drivers/misc/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig index fb933b0b9297..52a46b129214 100644 --- a/drivers/misc/Kconfig +++ b/drivers/misc/Kconfig @@ -773,7 +773,7 @@ config PANEL_BOOT_MESSAGE endif # PANEL config ASPEED_LPC_CTRL - depends on (ARCH_ASPEED || COMPILE_TEST) && REGMAP && MFD_SYSCON + depends on ARCH_ASPEED && REGMAP && MFD_SYSCON tristate "Aspeed ast2400/2500 HOST LPC to BMC bridge control" ---help--- Control Aspeed ast2400/2500 HOST LPC to BMC mappings through -- 2.11.0 -- Cheers, Stephen Rothwell
linux-next: build failure after merge of the char-misc tree
Hi all, After merging the char-misc tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/misc/aspeed-lpc-ctrl.c: In function 'aspeed_lpc_ctrl_mmap': drivers/misc/aspeed-lpc-ctrl.c:51:9: error: implicit declaration of function 'pgprot_dmacoherent' [-Werror=implicit-function-declaration] prot = pgprot_dmacoherent(prot); ^ drivers/misc/aspeed-lpc-ctrl.c:51:7: error: incompatible types when assigning to type 'pgprot_t {aka struct pgprot}' from type 'int' prot = pgprot_dmacoherent(prot); ^ In file included from include/linux/miscdevice.h:6:0, from drivers/misc/aspeed-lpc-ctrl.c:11: drivers/misc/aspeed-lpc-ctrl.c: In function 'aspeed_lpc_ctrl_probe': drivers/misc/aspeed-lpc-ctrl.c:232:17: warning: format '%x' expects argument of type 'unsigned int', but argument 3 has type 'phys_addr_t {aka long long unsigned int}' [-Wformat=] dev_info(dev, "Loaded at 0x%08x (0x%08x)\n", ^ include/linux/device.h:1317:51: note: in definition of macro 'dev_info' #define dev_info(dev, fmt, arg...) _dev_info(dev, fmt, ##arg) ^ drivers/misc/aspeed-lpc-ctrl.c:232:17: warning: format '%x' expects argument of type 'unsigned int', but argument 4 has type 'resource_size_t {aka long long unsigned int}' [-Wformat=] dev_info(dev, "Loaded at 0x%08x (0x%08x)\n", ^ include/linux/device.h:1317:51: note: in definition of macro 'dev_info' #define dev_info(dev, fmt, arg...) _dev_info(dev, fmt, ##arg) ^ Caused by commit 6c4e97678501 ("drivers/misc: Add Aspeed LPC control driver") Clearly this will only build on arm :-( You can only use COMPILE_TEST if you can reasonably expect the build to work on all architectures and platforms. I have added the following patch for today (the warnings should be fixed as well): From: Stephen Rothwell Date: Mon, 20 Mar 2017 13:38:10 +1100 Subject: [PATCH] drivers/misc: Aspeed LPC control driver will only build on arm Signed-off-by: Stephen Rothwell --- drivers/misc/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig index fb933b0b9297..52a46b129214 100644 --- a/drivers/misc/Kconfig +++ b/drivers/misc/Kconfig @@ -773,7 +773,7 @@ config PANEL_BOOT_MESSAGE endif # PANEL config ASPEED_LPC_CTRL - depends on (ARCH_ASPEED || COMPILE_TEST) && REGMAP && MFD_SYSCON + depends on ARCH_ASPEED && REGMAP && MFD_SYSCON tristate "Aspeed ast2400/2500 HOST LPC to BMC bridge control" ---help--- Control Aspeed ast2400/2500 HOST LPC to BMC mappings through -- 2.11.0 -- Cheers, Stephen Rothwell
linux-next: build failure after merge of the char-misc tree
Hi all, After merging the char-misc tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/hv/hv.c: In function 'read_hv_clock_tsc': drivers/hv/hv.c:154:4: error: implicit declaration of function 'rdtscll' [-Werror=implicit-function-declaration] rdtscll(cur_tsc); ^ Caused by commit ca9357bd26c2 ("Drivers: hv: vmbus: Implement a clocksource based on the TSC page") interacting with commits 87be28aaf145 ("x86/asm/tsc: Replace rdtscll() with native_read_tsc()") 4ea1636b04db ("x86/asm/tsc: Rename native_read_tsc() to rdtsc()") from the tip tree. Please consider maintaining API's for a release cycle when changing them. I have applied the following merge fix patch: From: Stephen Rothwell Date: Fri, 7 Aug 2015 16:21:32 +1000 Subject: [PATCH] Drivers: hv: vmbus: fix for the removal of rdtscll() Signed-off-by: Stephen Rothwell --- drivers/hv/hv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/hv/hv.c b/drivers/hv/hv.c index 6341be8739ae..335064f01c37 100644 --- a/drivers/hv/hv.c +++ b/drivers/hv/hv.c @@ -151,7 +151,7 @@ static cycle_t read_hv_clock_tsc(struct clocksource *arg) u64 scale = tsc_pg->tsc_scale; s64 offset = tsc_pg->tsc_offset; - rdtscll(cur_tsc); + cur_tsc = rdtsc(); /* current_tick = ((cur_tsc *scale) >> 64) + offset */ asm("mulq %3" : "=d" (current_tick), "=a" (tmp) -- 2.5.0 -- Cheers, Stephen Rothwells...@canb.auug.org.au -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
linux-next: build failure after merge of the char-misc tree
Hi all, After merging the char-misc tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/hv/hv.c: In function 'read_hv_clock_tsc': drivers/hv/hv.c:154:4: error: implicit declaration of function 'rdtscll' [-Werror=implicit-function-declaration] rdtscll(cur_tsc); ^ Caused by commit ca9357bd26c2 (Drivers: hv: vmbus: Implement a clocksource based on the TSC page) interacting with commits 87be28aaf145 (x86/asm/tsc: Replace rdtscll() with native_read_tsc()) 4ea1636b04db (x86/asm/tsc: Rename native_read_tsc() to rdtsc()) from the tip tree. Please consider maintaining API's for a release cycle when changing them. I have applied the following merge fix patch: From: Stephen Rothwell s...@canb.auug.org.au Date: Fri, 7 Aug 2015 16:21:32 +1000 Subject: [PATCH] Drivers: hv: vmbus: fix for the removal of rdtscll() Signed-off-by: Stephen Rothwell s...@canb.auug.org.au --- drivers/hv/hv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/hv/hv.c b/drivers/hv/hv.c index 6341be8739ae..335064f01c37 100644 --- a/drivers/hv/hv.c +++ b/drivers/hv/hv.c @@ -151,7 +151,7 @@ static cycle_t read_hv_clock_tsc(struct clocksource *arg) u64 scale = tsc_pg-tsc_scale; s64 offset = tsc_pg-tsc_offset; - rdtscll(cur_tsc); + cur_tsc = rdtsc(); /* current_tick = ((cur_tsc *scale) 64) + offset */ asm(mulq %3 : =d (current_tick), =a (tmp) -- 2.5.0 -- Cheers, Stephen Rothwells...@canb.auug.org.au -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: build failure after merge of the char-misc tree
On Wed, May 27, 2015 at 07:08:06AM +, Winkler, Tomas wrote: > > > > Hi all, > > > > After merging the char-misc tree, today's linux-next build (x86_64 > > allmodconfig) > > failed like this: > > > Might be the case that this one was left out ? > https://lkml.org/lkml/2015/5/7/522 > uuid: extract macros for assigning raw arrays Odd, somehow I missed that one. Can you please resend it, I don't see it in my queue anywhere. thanks, greg k-h -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
RE: linux-next: build failure after merge of the char-misc tree
> Hi all, > > After merging the char-misc tree, today's linux-next build (x86_64 > allmodconfig) > failed like this: > Might be the case that this one was left out ? https://lkml.org/lkml/2015/5/7/522 uuid: extract macros for assigning raw arrays Tomas -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: build failure after merge of the char-misc tree
On Wed, May 27, 2015 at 07:08:06AM +, Winkler, Tomas wrote: Hi all, After merging the char-misc tree, today's linux-next build (x86_64 allmodconfig) failed like this: Might be the case that this one was left out ? https://lkml.org/lkml/2015/5/7/522 uuid: extract macros for assigning raw arrays Odd, somehow I missed that one. Can you please resend it, I don't see it in my queue anywhere. thanks, greg k-h -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
RE: linux-next: build failure after merge of the char-misc tree
Hi all, After merging the char-misc tree, today's linux-next build (x86_64 allmodconfig) failed like this: Might be the case that this one was left out ? https://lkml.org/lkml/2015/5/7/522 uuid: extract macros for assigning raw arrays Tomas -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
linux-next: build failure after merge of the char-misc tree
Hi all, After merging the char-misc tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/nfc/microread/mei.c:70:2: error: implicit declaration of function '__UUID_LE' [-Werror=implicit-function-declaration] { MICROREAD_DRIVER_NAME, MEI_NFC_UUID}, ^ drivers/nfc/microread/mei.c:70:2: warning: missing braces around initializer [-Wmissing-braces] drivers/nfc/microread/mei.c:70:2: warning: (near initialization for 'microread_mei_tbl[0].uuid') [-Wmissing-braces] drivers/nfc/microread/mei.c:70:2: error: initializer element is not constant drivers/nfc/microread/mei.c:70:2: error: (near initialization for 'microread_mei_tbl[0].uuid[0]') cc1: some warnings being treated as errors Caused by commit c93b76b34b4d ("mei: bus: report also uuid in module alias"). I have used the char-misc tree from next-20150526 for today. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpL5A7TADMrP.pgp Description: OpenPGP digital signature
linux-next: build failure after merge of the char-misc tree
Hi all, After merging the char-misc tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/nfc/microread/mei.c:70:2: error: implicit declaration of function '__UUID_LE' [-Werror=implicit-function-declaration] { MICROREAD_DRIVER_NAME, MEI_NFC_UUID}, ^ drivers/nfc/microread/mei.c:70:2: warning: missing braces around initializer [-Wmissing-braces] drivers/nfc/microread/mei.c:70:2: warning: (near initialization for 'microread_mei_tbl[0].uuid') [-Wmissing-braces] drivers/nfc/microread/mei.c:70:2: error: initializer element is not constant drivers/nfc/microread/mei.c:70:2: error: (near initialization for 'microread_mei_tbl[0].uuid[0]') cc1: some warnings being treated as errors Caused by commit c93b76b34b4d (mei: bus: report also uuid in module alias). I have used the char-misc tree from next-20150526 for today. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpL5A7TADMrP.pgp Description: OpenPGP digital signature
Re: linux-next: build failure after merge of the char-misc tree
Hi Greg, On Wed, 26 Feb 2014 19:37:16 -0800 Greg KH wrote: > > On Wed, Feb 26, 2014 at 05:47:21PM +1100, Stephen Rothwell wrote: > > > > On Fri, 21 Feb 2014 16:47:11 +1100 Stephen Rothwell > > wrote: > > > > > > After merging the char-misc tree, today's linux-next build (x86_64 > > > allmodconfig) failed like this: > > > > > > In file included from drivers/misc/mei/hw-txe.c:25:0: > > > drivers/misc/mei/hw-txe.h:63:1: error: unknown type name 'irqreturn_t' > > > irqreturn_t mei_txe_irq_quick_handler(int irq, void *dev_id); > > > ^ > > > > > > Caused by commit 266f6178d1f1 ("mei: txe: add hw-txe.h header file") but > > > probably exposed by commit 46cb7b1bd86f ("PCI: Remove unused SR-IOV VF > > > Migration support") from the pci tree which removed the include of > > > irqreturn.h from pci.h ... > > > > > > See Rule 1 from Documentation/SubmitChecklist ... > > > > > > I added the following merge fix patch (this should be applied to the > > > char-misc tree): > > > > Ping? > > I've merged everything together, and it all builds properly for me in > the char-misc branches, so I don't see what is missing. What did I do > wrong? Nothing, your tree is fine, except when merged with the pci tree. There is a commit in the pci tree that removed the include of irqreturn.h from pci.h, thus exposing that drivers/misc/mei/hw-txe.c did not include irqreturn.h directly despite using stuff from there (similarly for hw-txe.h). My patch is just a "quality of implementation" thing in your tree at the moment, but applying it to your tree will save doing the semantic merge conflict fixup in linux-next and later in Linus' tree when your tree and the pci tree meet there. i.e. it does not hurt your tree to apply it and will save is forgetting later. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpiMz9v22hbJ.pgp Description: PGP signature
Re: linux-next: build failure after merge of the char-misc tree
On Wed, Feb 26, 2014 at 05:47:21PM +1100, Stephen Rothwell wrote: > Hi Greg, > > On Fri, 21 Feb 2014 16:47:11 +1100 Stephen Rothwell > wrote: > > > > After merging the char-misc tree, today's linux-next build (x86_64 > > allmodconfig) failed like this: > > > > In file included from drivers/misc/mei/hw-txe.c:25:0: > > drivers/misc/mei/hw-txe.h:63:1: error: unknown type name 'irqreturn_t' > > irqreturn_t mei_txe_irq_quick_handler(int irq, void *dev_id); > > ^ > > > > Caused by commit 266f6178d1f1 ("mei: txe: add hw-txe.h header file") but > > probably exposed by commit 46cb7b1bd86f ("PCI: Remove unused SR-IOV VF > > Migration support") from the pci tree which removed the include of > > irqreturn.h from pci.h ... > > > > See Rule 1 from Documentation/SubmitChecklist ... > > > > I added the following merge fix patch (this should be applied to the > > char-misc tree): > > Ping? I've merged everything together, and it all builds properly for me in the char-misc branches, so I don't see what is missing. What did I do wrong? confused, greg k-h -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: build failure after merge of the char-misc tree
On Wed, Feb 26, 2014 at 05:47:21PM +1100, Stephen Rothwell wrote: Hi Greg, On Fri, 21 Feb 2014 16:47:11 +1100 Stephen Rothwell s...@canb.auug.org.au wrote: After merging the char-misc tree, today's linux-next build (x86_64 allmodconfig) failed like this: In file included from drivers/misc/mei/hw-txe.c:25:0: drivers/misc/mei/hw-txe.h:63:1: error: unknown type name 'irqreturn_t' irqreturn_t mei_txe_irq_quick_handler(int irq, void *dev_id); ^ Caused by commit 266f6178d1f1 (mei: txe: add hw-txe.h header file) but probably exposed by commit 46cb7b1bd86f (PCI: Remove unused SR-IOV VF Migration support) from the pci tree which removed the include of irqreturn.h from pci.h ... See Rule 1 from Documentation/SubmitChecklist ... I added the following merge fix patch (this should be applied to the char-misc tree): Ping? I've merged everything together, and it all builds properly for me in the char-misc branches, so I don't see what is missing. What did I do wrong? confused, greg k-h -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: build failure after merge of the char-misc tree
Hi Greg, On Wed, 26 Feb 2014 19:37:16 -0800 Greg KH g...@kroah.com wrote: On Wed, Feb 26, 2014 at 05:47:21PM +1100, Stephen Rothwell wrote: On Fri, 21 Feb 2014 16:47:11 +1100 Stephen Rothwell s...@canb.auug.org.au wrote: After merging the char-misc tree, today's linux-next build (x86_64 allmodconfig) failed like this: In file included from drivers/misc/mei/hw-txe.c:25:0: drivers/misc/mei/hw-txe.h:63:1: error: unknown type name 'irqreturn_t' irqreturn_t mei_txe_irq_quick_handler(int irq, void *dev_id); ^ Caused by commit 266f6178d1f1 (mei: txe: add hw-txe.h header file) but probably exposed by commit 46cb7b1bd86f (PCI: Remove unused SR-IOV VF Migration support) from the pci tree which removed the include of irqreturn.h from pci.h ... See Rule 1 from Documentation/SubmitChecklist ... I added the following merge fix patch (this should be applied to the char-misc tree): Ping? I've merged everything together, and it all builds properly for me in the char-misc branches, so I don't see what is missing. What did I do wrong? Nothing, your tree is fine, except when merged with the pci tree. There is a commit in the pci tree that removed the include of irqreturn.h from pci.h, thus exposing that drivers/misc/mei/hw-txe.c did not include irqreturn.h directly despite using stuff from there (similarly for hw-txe.h). My patch is just a quality of implementation thing in your tree at the moment, but applying it to your tree will save doing the semantic merge conflict fixup in linux-next and later in Linus' tree when your tree and the pci tree meet there. i.e. it does not hurt your tree to apply it and will save is forgetting later. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpiMz9v22hbJ.pgp Description: PGP signature
Re: linux-next: build failure after merge of the char-misc tree
Hi Greg, On Fri, 21 Feb 2014 16:47:11 +1100 Stephen Rothwell wrote: > > After merging the char-misc tree, today's linux-next build (x86_64 > allmodconfig) failed like this: > > In file included from drivers/misc/mei/hw-txe.c:25:0: > drivers/misc/mei/hw-txe.h:63:1: error: unknown type name 'irqreturn_t' > irqreturn_t mei_txe_irq_quick_handler(int irq, void *dev_id); > ^ > > Caused by commit 266f6178d1f1 ("mei: txe: add hw-txe.h header file") but > probably exposed by commit 46cb7b1bd86f ("PCI: Remove unused SR-IOV VF > Migration support") from the pci tree which removed the include of > irqreturn.h from pci.h ... > > See Rule 1 from Documentation/SubmitChecklist ... > > I added the following merge fix patch (this should be applied to the > char-misc tree): Ping? -- Cheers, Stephen Rothwells...@canb.auug.org.au pgprJ5GNTlvwv.pgp Description: PGP signature
Re: linux-next: build failure after merge of the char-misc tree
Hi Greg, On Fri, 21 Feb 2014 16:47:11 +1100 Stephen Rothwell s...@canb.auug.org.au wrote: After merging the char-misc tree, today's linux-next build (x86_64 allmodconfig) failed like this: In file included from drivers/misc/mei/hw-txe.c:25:0: drivers/misc/mei/hw-txe.h:63:1: error: unknown type name 'irqreturn_t' irqreturn_t mei_txe_irq_quick_handler(int irq, void *dev_id); ^ Caused by commit 266f6178d1f1 (mei: txe: add hw-txe.h header file) but probably exposed by commit 46cb7b1bd86f (PCI: Remove unused SR-IOV VF Migration support) from the pci tree which removed the include of irqreturn.h from pci.h ... See Rule 1 from Documentation/SubmitChecklist ... I added the following merge fix patch (this should be applied to the char-misc tree): Ping? -- Cheers, Stephen Rothwells...@canb.auug.org.au pgprJ5GNTlvwv.pgp Description: PGP signature
linux-next: build failure after merge of the char-misc tree
Hi all, After merging the char-misc tree, today's linux-next build (x86_64 allmodconfig) failed like this: In file included from drivers/misc/mei/hw-txe.c:25:0: drivers/misc/mei/hw-txe.h:63:1: error: unknown type name 'irqreturn_t' irqreturn_t mei_txe_irq_quick_handler(int irq, void *dev_id); ^ drivers/misc/mei/hw-txe.h:64:1: error: unknown type name 'irqreturn_t' irqreturn_t mei_txe_irq_thread_handler(int irq, void *dev_id); ^ drivers/misc/mei/hw-txe.c:879:1: error: unknown type name 'irqreturn_t' irqreturn_t mei_txe_irq_quick_handler(int irq, void *dev_id) ^ drivers/misc/mei/hw-txe.c: In function 'mei_txe_irq_quick_handler': drivers/misc/mei/hw-txe.c:884:10: error: 'IRQ_WAKE_THREAD' undeclared (first use in this function) return IRQ_WAKE_THREAD; ^ drivers/misc/mei/hw-txe.c:884:10: note: each undeclared identifier is reported only once for each function it appears in drivers/misc/mei/hw-txe.c:885:9: error: 'IRQ_NONE' undeclared (first use in this function) return IRQ_NONE; ^ drivers/misc/mei/hw-txe.c: At top level: drivers/misc/mei/hw-txe.c:898:1: error: unknown type name 'irqreturn_t' irqreturn_t mei_txe_irq_thread_handler(int irq, void *dev_id) ^ drivers/misc/mei/hw-txe.c: In function 'mei_txe_irq_thread_handler': drivers/misc/mei/hw-txe.c:1007:9: error: 'IRQ_HANDLED' undeclared (first use in this function) return IRQ_HANDLED; ^ drivers/misc/mei/hw-txe.c: In function 'mei_txe_irq_quick_handler': drivers/misc/mei/hw-txe.c:886:1: warning: control reaches end of non-void function [-Wreturn-type] } ^ drivers/misc/mei/hw-txe.c: In function 'mei_txe_irq_thread_handler': drivers/misc/mei/hw-txe.c:1008:1: warning: control reaches end of non-void function [-Wreturn-type] } ^ Caused by commit 266f6178d1f1 ("mei: txe: add hw-txe.h header file") but probably exposed by commit 46cb7b1bd86f ("PCI: Remove unused SR-IOV VF Migration support") from the pci tree which removed the include of irqreturn.h from pci.h ... See Rule 1 from Documentation/SubmitChecklist ... I added the following merge fix patch (this should be applied to the char-misc tree): From: Stephen Rothwell Date: Fri, 21 Feb 2014 16:38:28 +1100 Subject: [PATCH] mei: txe: include irqreturn.h for irqreturn_t etc Signed-off-by: Stephen Rothwell --- drivers/misc/mei/hw-txe.c | 1 + drivers/misc/mei/hw-txe.h | 2 ++ 2 files changed, 3 insertions(+) diff --git a/drivers/misc/mei/hw-txe.c b/drivers/misc/mei/hw-txe.c index 19579e560dad..49a5ed376969 100644 --- a/drivers/misc/mei/hw-txe.c +++ b/drivers/misc/mei/hw-txe.c @@ -18,6 +18,7 @@ #include #include #include +#include #include diff --git a/drivers/misc/mei/hw-txe.h b/drivers/misc/mei/hw-txe.h index 857d88ccef61..fdb665f44d5d 100644 --- a/drivers/misc/mei/hw-txe.h +++ b/drivers/misc/mei/hw-txe.h @@ -17,6 +17,8 @@ #ifndef _MEI_HW_TXE_H_ #define _MEI_HW_TXE_H_ +#include + #include "hw.h" #include "hw-txe-regs.h" -- 1.9.0 -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpP7H6Th8e0h.pgp Description: PGP signature
linux-next: build failure after merge of the char-misc tree
Hi all, After merging the char-misc tree, today's linux-next build (x86_64 allmodconfig) failed like this: In file included from drivers/misc/mei/hw-txe.c:25:0: drivers/misc/mei/hw-txe.h:63:1: error: unknown type name 'irqreturn_t' irqreturn_t mei_txe_irq_quick_handler(int irq, void *dev_id); ^ drivers/misc/mei/hw-txe.h:64:1: error: unknown type name 'irqreturn_t' irqreturn_t mei_txe_irq_thread_handler(int irq, void *dev_id); ^ drivers/misc/mei/hw-txe.c:879:1: error: unknown type name 'irqreturn_t' irqreturn_t mei_txe_irq_quick_handler(int irq, void *dev_id) ^ drivers/misc/mei/hw-txe.c: In function 'mei_txe_irq_quick_handler': drivers/misc/mei/hw-txe.c:884:10: error: 'IRQ_WAKE_THREAD' undeclared (first use in this function) return IRQ_WAKE_THREAD; ^ drivers/misc/mei/hw-txe.c:884:10: note: each undeclared identifier is reported only once for each function it appears in drivers/misc/mei/hw-txe.c:885:9: error: 'IRQ_NONE' undeclared (first use in this function) return IRQ_NONE; ^ drivers/misc/mei/hw-txe.c: At top level: drivers/misc/mei/hw-txe.c:898:1: error: unknown type name 'irqreturn_t' irqreturn_t mei_txe_irq_thread_handler(int irq, void *dev_id) ^ drivers/misc/mei/hw-txe.c: In function 'mei_txe_irq_thread_handler': drivers/misc/mei/hw-txe.c:1007:9: error: 'IRQ_HANDLED' undeclared (first use in this function) return IRQ_HANDLED; ^ drivers/misc/mei/hw-txe.c: In function 'mei_txe_irq_quick_handler': drivers/misc/mei/hw-txe.c:886:1: warning: control reaches end of non-void function [-Wreturn-type] } ^ drivers/misc/mei/hw-txe.c: In function 'mei_txe_irq_thread_handler': drivers/misc/mei/hw-txe.c:1008:1: warning: control reaches end of non-void function [-Wreturn-type] } ^ Caused by commit 266f6178d1f1 (mei: txe: add hw-txe.h header file) but probably exposed by commit 46cb7b1bd86f (PCI: Remove unused SR-IOV VF Migration support) from the pci tree which removed the include of irqreturn.h from pci.h ... See Rule 1 from Documentation/SubmitChecklist ... I added the following merge fix patch (this should be applied to the char-misc tree): From: Stephen Rothwell s...@canb.auug.org.au Date: Fri, 21 Feb 2014 16:38:28 +1100 Subject: [PATCH] mei: txe: include irqreturn.h for irqreturn_t etc Signed-off-by: Stephen Rothwell s...@canb.auug.org.au --- drivers/misc/mei/hw-txe.c | 1 + drivers/misc/mei/hw-txe.h | 2 ++ 2 files changed, 3 insertions(+) diff --git a/drivers/misc/mei/hw-txe.c b/drivers/misc/mei/hw-txe.c index 19579e560dad..49a5ed376969 100644 --- a/drivers/misc/mei/hw-txe.c +++ b/drivers/misc/mei/hw-txe.c @@ -18,6 +18,7 @@ #include linux/jiffies.h #include linux/delay.h #include linux/kthread.h +#include linux/irqreturn.h #include linux/mei.h diff --git a/drivers/misc/mei/hw-txe.h b/drivers/misc/mei/hw-txe.h index 857d88ccef61..fdb665f44d5d 100644 --- a/drivers/misc/mei/hw-txe.h +++ b/drivers/misc/mei/hw-txe.h @@ -17,6 +17,8 @@ #ifndef _MEI_HW_TXE_H_ #define _MEI_HW_TXE_H_ +#include linux/irqreturn.h + #include hw.h #include hw-txe-regs.h -- 1.9.0 -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpP7H6Th8e0h.pgp Description: PGP signature
Re: linux-next: build failure after merge of the char-misc tree
On Fri, Sep 27, 2013 at 05:10:29PM +1000, Stephen Rothwell wrote: > Hi all, > > After merging the char-misc tree, today's linux-next build (x86_64 > allmodconfig) failed like this: > > drivers/misc/mic/host/mic_main.c: In function 'mic_probe': > drivers/misc/mic/host/mic_main.c:320:3: error: too many arguments to function > 'sysfs_get_dirent' >NULL, "state"); >^ > In file included from include/linux/kobject.h:21:0, > from include/linux/module.h:16, > from drivers/misc/mic/host/mic_main.c:26: > include/linux/sysfs.h:465:1: note: declared here > sysfs_get_dirent(struct sysfs_dirent *parent_sd, const unsigned char *name) > ^ > > Caused by commit 3a6a9201897c ("Intel MIC Host Driver, card OS state > management") interacting with commit 388975cccaaf ("sysfs: clean up > sysfs_get_dirent()") from the driver-core tree. > > I added this merge fix patch: That looks correct, thanks, I'll carry this along to handle the merge issue when it all goes to Linus. greg k-h -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
linux-next: build failure after merge of the char-misc tree
Hi all, After merging the char-misc tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/misc/mic/host/mic_main.c: In function 'mic_probe': drivers/misc/mic/host/mic_main.c:320:3: error: too many arguments to function 'sysfs_get_dirent' NULL, "state"); ^ In file included from include/linux/kobject.h:21:0, from include/linux/module.h:16, from drivers/misc/mic/host/mic_main.c:26: include/linux/sysfs.h:465:1: note: declared here sysfs_get_dirent(struct sysfs_dirent *parent_sd, const unsigned char *name) ^ Caused by commit 3a6a9201897c ("Intel MIC Host Driver, card OS state management") interacting with commit 388975cccaaf ("sysfs: clean up sysfs_get_dirent()") from the driver-core tree. I added this merge fix patch: From: Stephen Rothwell Date: Fri, 27 Sep 2013 17:07:12 +1000 Subject: [PATCH] Intel MIC Host Driver: fix for sysfs_get_dirent API change Signed-off-by: Stephen Rothwell --- drivers/misc/mic/host/mic_main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/misc/mic/host/mic_main.c b/drivers/misc/mic/host/mic_main.c index a8965d4..28c8490 100644 --- a/drivers/misc/mic/host/mic_main.c +++ b/drivers/misc/mic/host/mic_main.c @@ -316,8 +316,7 @@ static int mic_probe(struct pci_dev *pdev, "device_create_with_groups failed rc %d\n", rc); goto smpt_uninit; } - mdev->state_sysfs = sysfs_get_dirent(mdev->sdev->kobj.sd, - NULL, "state"); + mdev->state_sysfs = sysfs_get_dirent(mdev->sdev->kobj.sd, "state"); if (!mdev->state_sysfs) { rc = -ENODEV; dev_err(>dev, "sysfs_get_dirent failed rc %d\n", rc); -- 1.8.4.rc3 -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpyU8wMESnoE.pgp Description: PGP signature
linux-next: build failure after merge of the char-misc tree
Hi all, After merging the char-misc tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/misc/mic/host/mic_main.c: In function 'mic_probe': drivers/misc/mic/host/mic_main.c:320:3: error: too many arguments to function 'sysfs_get_dirent' NULL, state); ^ In file included from include/linux/kobject.h:21:0, from include/linux/module.h:16, from drivers/misc/mic/host/mic_main.c:26: include/linux/sysfs.h:465:1: note: declared here sysfs_get_dirent(struct sysfs_dirent *parent_sd, const unsigned char *name) ^ Caused by commit 3a6a9201897c (Intel MIC Host Driver, card OS state management) interacting with commit 388975cccaaf (sysfs: clean up sysfs_get_dirent()) from the driver-core tree. I added this merge fix patch: From: Stephen Rothwell s...@canb.auug.org.au Date: Fri, 27 Sep 2013 17:07:12 +1000 Subject: [PATCH] Intel MIC Host Driver: fix for sysfs_get_dirent API change Signed-off-by: Stephen Rothwell s...@canb.auug.org.au --- drivers/misc/mic/host/mic_main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/misc/mic/host/mic_main.c b/drivers/misc/mic/host/mic_main.c index a8965d4..28c8490 100644 --- a/drivers/misc/mic/host/mic_main.c +++ b/drivers/misc/mic/host/mic_main.c @@ -316,8 +316,7 @@ static int mic_probe(struct pci_dev *pdev, device_create_with_groups failed rc %d\n, rc); goto smpt_uninit; } - mdev-state_sysfs = sysfs_get_dirent(mdev-sdev-kobj.sd, - NULL, state); + mdev-state_sysfs = sysfs_get_dirent(mdev-sdev-kobj.sd, state); if (!mdev-state_sysfs) { rc = -ENODEV; dev_err(pdev-dev, sysfs_get_dirent failed rc %d\n, rc); -- 1.8.4.rc3 -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpyU8wMESnoE.pgp Description: PGP signature
Re: linux-next: build failure after merge of the char-misc tree
On Fri, Sep 27, 2013 at 05:10:29PM +1000, Stephen Rothwell wrote: Hi all, After merging the char-misc tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/misc/mic/host/mic_main.c: In function 'mic_probe': drivers/misc/mic/host/mic_main.c:320:3: error: too many arguments to function 'sysfs_get_dirent' NULL, state); ^ In file included from include/linux/kobject.h:21:0, from include/linux/module.h:16, from drivers/misc/mic/host/mic_main.c:26: include/linux/sysfs.h:465:1: note: declared here sysfs_get_dirent(struct sysfs_dirent *parent_sd, const unsigned char *name) ^ Caused by commit 3a6a9201897c (Intel MIC Host Driver, card OS state management) interacting with commit 388975cccaaf (sysfs: clean up sysfs_get_dirent()) from the driver-core tree. I added this merge fix patch: That looks correct, thanks, I'll carry this along to handle the merge issue when it all goes to Linus. greg k-h -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: build failure after merge of the char-misc tree
Am Tue, 2 Apr 2013 17:29:50 +1100 schrieb Stephen Rothwell : > Hi all, > > After merging the char-misc tree, today's linux-next build (x86_64 > allmodconfig) failed like this: > > drivers/misc/cs5535-mfgpt.c:30:3: warning: missing terminating " > character [enabled by default] drivers/misc/cs5535-mfgpt.c:31:31: > warning: missing terminating " character [enabled by default] > drivers/misc/cs5535-mfgpt.c:384:0: error: unterminated argument list > invoking macro "MODULE_PARM_DESC" drivers/misc/cs5535-mfgpt.c:27:1: > error: expected '=', ',', ';', 'asm' or '__attribute__' at end of > input > > Caused by commit 945480b159aa ("cs5535-mfgpt: Add another reset > method"). > > I have used the char-misc tree from next-20130328 for today. New patch sent. A terminating quote was missing. Looks like I fat fingered it while editing the patch file by hand... Sorry for that, //richard -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
linux-next: build failure after merge of the char-misc tree
Hi all, After merging the char-misc tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/misc/cs5535-mfgpt.c:30:3: warning: missing terminating " character [enabled by default] drivers/misc/cs5535-mfgpt.c:31:31: warning: missing terminating " character [enabled by default] drivers/misc/cs5535-mfgpt.c:384:0: error: unterminated argument list invoking macro "MODULE_PARM_DESC" drivers/misc/cs5535-mfgpt.c:27:1: error: expected '=', ',', ';', 'asm' or '__attribute__' at end of input Caused by commit 945480b159aa ("cs5535-mfgpt: Add another reset method"). I have used the char-misc tree from next-20130328 for today. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpEKAR4o4l6l.pgp Description: PGP signature
linux-next: build failure after merge of the char-misc tree
Hi all, After merging the char-misc tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/misc/cs5535-mfgpt.c:30:3: warning: missing terminating character [enabled by default] drivers/misc/cs5535-mfgpt.c:31:31: warning: missing terminating character [enabled by default] drivers/misc/cs5535-mfgpt.c:384:0: error: unterminated argument list invoking macro MODULE_PARM_DESC drivers/misc/cs5535-mfgpt.c:27:1: error: expected '=', ',', ';', 'asm' or '__attribute__' at end of input Caused by commit 945480b159aa (cs5535-mfgpt: Add another reset method). I have used the char-misc tree from next-20130328 for today. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpEKAR4o4l6l.pgp Description: PGP signature
Re: linux-next: build failure after merge of the char-misc tree
Am Tue, 2 Apr 2013 17:29:50 +1100 schrieb Stephen Rothwell s...@canb.auug.org.au: Hi all, After merging the char-misc tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/misc/cs5535-mfgpt.c:30:3: warning: missing terminating character [enabled by default] drivers/misc/cs5535-mfgpt.c:31:31: warning: missing terminating character [enabled by default] drivers/misc/cs5535-mfgpt.c:384:0: error: unterminated argument list invoking macro MODULE_PARM_DESC drivers/misc/cs5535-mfgpt.c:27:1: error: expected '=', ',', ';', 'asm' or '__attribute__' at end of input Caused by commit 945480b159aa (cs5535-mfgpt: Add another reset method). I have used the char-misc tree from next-20130328 for today. New patch sent. A terminating quote was missing. Looks like I fat fingered it while editing the patch file by hand... Sorry for that, //richard -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
linux-next: build failure after merge of the char-misc tree
Hi all, After merging the char-misc tree, today's linux-next build (x86_64_allmodconfig) failed like this: drivers/input/keyboard/pmic8xxx-keypad.c:24:35: fatal error: linux/mfd/pm8xxx/gpio.h: No such file or directory Caused by commit e44b0ceee4cc ("add single-wire serial bus interface (SSBI) driver") which added the Kconfig symbol MSM_SSBI (later changed to just SSBI) which did not exist in the tree before. However, MFD_PM8921_CORE depended on it and that selects MFD_PM8XXX which allows the above file to build (and fail). I have used the char-misc tree from next-20130325 for today. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpiUi9N76tH1.pgp Description: PGP signature
linux-next: build failure after merge of the char-misc tree
Hi all, After merging the char-misc tree, today's linux-next build (x86_64_allmodconfig) failed like this: drivers/input/keyboard/pmic8xxx-keypad.c:24:35: fatal error: linux/mfd/pm8xxx/gpio.h: No such file or directory Caused by commit e44b0ceee4cc (add single-wire serial bus interface (SSBI) driver) which added the Kconfig symbol MSM_SSBI (later changed to just SSBI) which did not exist in the tree before. However, MFD_PM8921_CORE depended on it and that selects MFD_PM8XXX which allows the above file to build (and fail). I have used the char-misc tree from next-20130325 for today. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpiUi9N76tH1.pgp Description: PGP signature
Re: linux-next: build failure after merge of the char-misc tree
On Mon, Mar 18, 2013 at 01:56:14PM +1100, Stephen Rothwell wrote: > Hi all, > > After merging the char-misc tree, today's linux-next build (x86_64 > allmodconfig) failed like this: > > drivers/net/can/softing/softing_cs.c:343:1: error: expected identifier or '(' > before '&' token > drivers/net/can/softing/softing_cs.c: In function '__inittest': > drivers/net/can/softing/softing_cs.c:343:1: error: 'softingcs_driver_init' > undeclared (first use in this function) > drivers/net/can/softing/softing_cs.c:343:1: note: each undeclared identifier > is reported only once for each function it appears in > drivers/net/can/softing/softing_cs.c: At top level: > drivers/net/can/softing/softing_cs.c:343:1: error: expected identifier or '(' > before '&' token > drivers/net/can/softing/softing_cs.c: In function '__exittest': > drivers/net/can/softing/softing_cs.c:343:1: error: 'softingcs_driver_exit' > undeclared (first use in this function) > drivers/net/can/softing/softing_cs.c: At top level: > drivers/net/can/softing/softing_cs.c:335:29: warning: 'softingcs_driver' > defined but not used [-Wunused-variable] > drivers/net/can/softing/softing_cs.c:343:1: error: 'init_module' aliased to > undefined symbol '_driver_init' > drivers/net/can/softing/softing_cs.c:343:1: error: 'cleanup_module' aliased > to undefined symbol '_driver_exit' > > Caused by commit a750fa4edd9e ("softingcs: use module_pcmcia_driver"). > > I have used the char-misc tree form next-20130315 for today. I have no idea what I've overlooked during tests. My apologies. I have found the problem. Can this be squashed? Kurt -- commit 081ec8f7f7ef4d68c7a6ffe4a571b1a855527627 Author: Kurt Van Dijck Date: Mon Mar 18 09:56:55 2013 FIX: softingcs conversion to module_pcmcia_driver macro Signed-off-by: Kurt Van Dijck diff --git a/drivers/net/can/softing/softing_cs.c b/drivers/net/can/softing/softing_cs.c index 738355c..498605f 100644 --- a/drivers/net/can/softing/softing_cs.c +++ b/drivers/net/can/softing/softing_cs.c @@ -340,7 +340,7 @@ static struct pcmcia_driver softingcs_driver = { .remove = softingcs_remove, }; -module_pcmcia_driver(_driver); +module_pcmcia_driver(softingcs_driver); MODULE_DESCRIPTION("softing CANcard driver" ", links PCMCIA card to softing driver"); -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: build failure after merge of the char-misc tree
On Mon, Mar 18, 2013 at 01:56:14PM +1100, Stephen Rothwell wrote: Hi all, After merging the char-misc tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/net/can/softing/softing_cs.c:343:1: error: expected identifier or '(' before '' token drivers/net/can/softing/softing_cs.c: In function '__inittest': drivers/net/can/softing/softing_cs.c:343:1: error: 'softingcs_driver_init' undeclared (first use in this function) drivers/net/can/softing/softing_cs.c:343:1: note: each undeclared identifier is reported only once for each function it appears in drivers/net/can/softing/softing_cs.c: At top level: drivers/net/can/softing/softing_cs.c:343:1: error: expected identifier or '(' before '' token drivers/net/can/softing/softing_cs.c: In function '__exittest': drivers/net/can/softing/softing_cs.c:343:1: error: 'softingcs_driver_exit' undeclared (first use in this function) drivers/net/can/softing/softing_cs.c: At top level: drivers/net/can/softing/softing_cs.c:335:29: warning: 'softingcs_driver' defined but not used [-Wunused-variable] drivers/net/can/softing/softing_cs.c:343:1: error: 'init_module' aliased to undefined symbol 'softingcs_driver_init' drivers/net/can/softing/softing_cs.c:343:1: error: 'cleanup_module' aliased to undefined symbol 'softingcs_driver_exit' Caused by commit a750fa4edd9e (softingcs: use module_pcmcia_driver). I have used the char-misc tree form next-20130315 for today. I have no idea what I've overlooked during tests. My apologies. I have found the problem. Can this be squashed? Kurt -- commit 081ec8f7f7ef4d68c7a6ffe4a571b1a855527627 Author: Kurt Van Dijck kurt.van.di...@eia.be Date: Mon Mar 18 09:56:55 2013 FIX: softingcs conversion to module_pcmcia_driver macro Signed-off-by: Kurt Van Dijck kurt.van.di...@eia.be diff --git a/drivers/net/can/softing/softing_cs.c b/drivers/net/can/softing/softing_cs.c index 738355c..498605f 100644 --- a/drivers/net/can/softing/softing_cs.c +++ b/drivers/net/can/softing/softing_cs.c @@ -340,7 +340,7 @@ static struct pcmcia_driver softingcs_driver = { .remove = softingcs_remove, }; -module_pcmcia_driver(softingcs_driver); +module_pcmcia_driver(softingcs_driver); MODULE_DESCRIPTION(softing CANcard driver , links PCMCIA card to softing driver); -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
linux-next: build failure after merge of the char-misc tree
Hi all, After merging the char-misc tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/net/can/softing/softing_cs.c:343:1: error: expected identifier or '(' before '&' token drivers/net/can/softing/softing_cs.c: In function '__inittest': drivers/net/can/softing/softing_cs.c:343:1: error: 'softingcs_driver_init' undeclared (first use in this function) drivers/net/can/softing/softing_cs.c:343:1: note: each undeclared identifier is reported only once for each function it appears in drivers/net/can/softing/softing_cs.c: At top level: drivers/net/can/softing/softing_cs.c:343:1: error: expected identifier or '(' before '&' token drivers/net/can/softing/softing_cs.c: In function '__exittest': drivers/net/can/softing/softing_cs.c:343:1: error: 'softingcs_driver_exit' undeclared (first use in this function) drivers/net/can/softing/softing_cs.c: At top level: drivers/net/can/softing/softing_cs.c:335:29: warning: 'softingcs_driver' defined but not used [-Wunused-variable] drivers/net/can/softing/softing_cs.c:343:1: error: 'init_module' aliased to undefined symbol '_driver_init' drivers/net/can/softing/softing_cs.c:343:1: error: 'cleanup_module' aliased to undefined symbol '_driver_exit' Caused by commit a750fa4edd9e ("softingcs: use module_pcmcia_driver"). I have used the char-misc tree form next-20130315 for today. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgps4HWZ0s8X7.pgp Description: PGP signature
linux-next: build failure after merge of the char-misc tree
Hi all, After merging the char-misc tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/net/can/softing/softing_cs.c:343:1: error: expected identifier or '(' before '' token drivers/net/can/softing/softing_cs.c: In function '__inittest': drivers/net/can/softing/softing_cs.c:343:1: error: 'softingcs_driver_init' undeclared (first use in this function) drivers/net/can/softing/softing_cs.c:343:1: note: each undeclared identifier is reported only once for each function it appears in drivers/net/can/softing/softing_cs.c: At top level: drivers/net/can/softing/softing_cs.c:343:1: error: expected identifier or '(' before '' token drivers/net/can/softing/softing_cs.c: In function '__exittest': drivers/net/can/softing/softing_cs.c:343:1: error: 'softingcs_driver_exit' undeclared (first use in this function) drivers/net/can/softing/softing_cs.c: At top level: drivers/net/can/softing/softing_cs.c:335:29: warning: 'softingcs_driver' defined but not used [-Wunused-variable] drivers/net/can/softing/softing_cs.c:343:1: error: 'init_module' aliased to undefined symbol 'softingcs_driver_init' drivers/net/can/softing/softing_cs.c:343:1: error: 'cleanup_module' aliased to undefined symbol 'softingcs_driver_exit' Caused by commit a750fa4edd9e (softingcs: use module_pcmcia_driver). I have used the char-misc tree form next-20130315 for today. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgps4HWZ0s8X7.pgp Description: PGP signature