On Tue, Jun 16, 2020 at 10:34:40AM +1000, Stephen Rothwell wrote: > [Just adding Herbert to cc] > > On Tue, 16 Jun 2020 10:33:30 +1000 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote: > > > > Hi all, > > > > After merging the vfs tree, today's linux-next build (x86_64 allmodconfig) > > failed like this: Thanks Stephen, here is an incremental patch to fix these up. ---8<--- Because linux/uio.h included crypto/hash.h a number of header files that should have been included weren't. This patch adds linux/slab.h where kmalloc/kfree are used, as well as a forward declaration in linux/socket.h for struct file. Reported-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> Fixes: f0187db056dc ("iov_iter: Move unnecessary inclusion of...") Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx> diff --git a/drivers/dma/st_fdma.c b/drivers/dma/st_fdma.c index 67087dbe2f9f..962b6e05287b 100644 --- a/drivers/dma/st_fdma.c +++ b/drivers/dma/st_fdma.c @@ -15,6 +15,7 @@ #include <linux/platform_device.h> #include <linux/interrupt.h> #include <linux/remoteproc.h> +#include <linux/slab.h> #include "st_fdma.h" diff --git a/drivers/dma/uniphier-xdmac.c b/drivers/dma/uniphier-xdmac.c index 7b2f8a8c2d31..16b19654873d 100644 --- a/drivers/dma/uniphier-xdmac.c +++ b/drivers/dma/uniphier-xdmac.c @@ -12,6 +12,7 @@ #include <linux/of.h> #include <linux/of_dma.h> #include <linux/platform_device.h> +#include <linux/slab.h> #include "dmaengine.h" #include "virt-dma.h" diff --git a/include/linux/socket.h b/include/linux/socket.h index 04d2bc97f497..e9cb30d8cbfb 100644 --- a/include/linux/socket.h +++ b/include/linux/socket.h @@ -10,6 +10,7 @@ #include <linux/compiler.h> /* __user */ #include <uapi/linux/socket.h> +struct file; struct pid; struct cred; struct socket; -- Email: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx> Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt