linux-kernel - Re: linux-next: build failure after merge of the mm tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-Id: <20240815155747.078805324103e374b8dbc805@linux-foundation.org>
Date: Thu, 15 Aug 2024 15:57:47 -0700
From: Andrew Morton <akpm@...ux-foundation.org>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: Jani Nikula <jani.nikula@...el.com>, Linux Kernel Mailing List
 <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>
Subject: Re: linux-next: build failure after merge of the mm tree

On Thu, 15 Aug 2024 10:06:45 +1000 Stephen Rothwell <sfr@...b.auug.org.au> wrote:

> > 
> > Caused by commit
> > 
> >   2771559a5531 ("fault-inject: improve build for CONFIG_FAULT_INJECTION=n")
> > 
> > This is just whack-a-mole ... :-(
> 
> These files might also be worth a look:
> 
> $ git grep -l '\<debugfs_' $(git grep -L 'linux/debugfs.h' $(git grep -l 'linux/fault-inject.h'))
> drivers/gpu/drm/msm/msm_drv.c
> drivers/misc/xilinx_tmr_inject.c
> drivers/ufs/core/ufs-fault-injection.c
> include/linux/mmc/host.h
> include/ufs/ufshcd.h

yup, thanks, why not.

 drivers/gpu/drm/msm/msm_drv.c          |    1 +
 drivers/ufs/core/ufs-fault-injection.c |    1 +
 include/linux/mmc/host.h               |    1 +
 include/ufs/ufshcd.h                   |    1 +
 4 files changed, 4 insertions(+)

--- a/drivers/gpu/drm/msm/msm_drv.c~fault-inject-improve-build-for-config_fault_injection=n-fix-3
+++ a/drivers/gpu/drm/msm/msm_drv.c
@@ -7,6 +7,7 @@
 
 #include <linux/dma-mapping.h>
 #include <linux/fault-inject.h>
+#include <linux/debugfs.h>
 #include <linux/of_address.h>
 #include <linux/uaccess.h>
 
--- a/drivers/ufs/core/ufs-fault-injection.c~fault-inject-improve-build-for-config_fault_injection=n-fix-3
+++ a/drivers/ufs/core/ufs-fault-injection.c
@@ -3,6 +3,7 @@
 #include <linux/kconfig.h>
 #include <linux/types.h>
 #include <linux/fault-inject.h>
+#include <linux/debugfs.h>
 #include <linux/module.h>
 #include <ufs/ufshcd.h>
 #include "ufs-fault-injection.h"
--- a/include/linux/mmc/host.h~fault-inject-improve-build-for-config_fault_injection=n-fix-3
+++ a/include/linux/mmc/host.h
@@ -10,6 +10,7 @@
 #include <linux/sched.h>
 #include <linux/device.h>
 #include <linux/fault-inject.h>
+#include <linux/debugfs.h>
 
 #include <linux/mmc/core.h>
 #include <linux/mmc/card.h>
--- a/include/ufs/ufshcd.h~fault-inject-improve-build-for-config_fault_injection=n-fix-3
+++ a/include/ufs/ufshcd.h
@@ -17,6 +17,7 @@
 #include <linux/blk-mq.h>
 #include <linux/devfreq.h>
 #include <linux/fault-inject.h>
+#include <linux/debugfs.h>
 #include <linux/msi.h>
 #include <linux/pm_runtime.h>
 #include <linux/dma-direction.h>
_