Merge branches 'amd-iommu/fixes' and 'dma-debug/fixes' into iommu/fixes

lib/dma-debug.c

@@ -587,7 +587,7 @@ out_unlock:
 	return count;
 }
 
-const struct file_operations filter_fops = {
+static const struct file_operations filter_fops = {
 	.read  = filter_read,
 	.write = filter_write,
 };