Commit b79675e1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 

Pull misc vfs updates from Al Viro:
 "No common topic whatsoever in those, sorry"

* 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  fs: define inode flags using bit numbers
  iov_iter: Move unnecessary inclusion of crypto/hash.h
  dlmfs: clean up dlmfs_file_{read,write}() a bit
parents d57b2b5b 6414e9b0

arch/s390/lib/test_unwind.c

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
#include <linux/kallsyms.h>

#include <linux/kthread.h>

#include <linux/module.h>

#include <linux/slab.h>

#include <linux/string.h>

#include <linux/kprobes.h>

#include <linux/wait.h>

drivers/dma/sf-pdma/sf-pdma.c

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include <linux/mod_devicetable.h>

#include <linux/dma-mapping.h>

#include <linux/of.h>

#include <linux/slab.h>



#include "sf-pdma.h"

drivers/dma/st_fdma.c

+1 −0
Original line number Diff line number Diff line
@@ -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"

drivers/dma/uniphier-xdmac.c

+1 −0
Original line number Diff line number Diff line
@@ -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"

drivers/misc/uacce/uacce.c

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
#include <linux/iommu.h>

#include <linux/module.h>

#include <linux/poll.h>

#include <linux/slab.h>

#include <linux/uacce.h>



static struct class *uacce_class;

CRA Git | Maintained and supported by SUSTech CRA and CCSE