apfs/linux-apfs
0
0
Fork 0
mirror of https://github.com/linux-apfs/linux-apfs.git synced 2026-05-01 15:00:59 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '3ff195b011d7decf501a4d55aeed312731094796' into for-linus

Browse Source 
Conflicts:
	drivers/md/md.c

- Resolved conflict in md_update_sb
- Added extra 'NULL' arg to new instance of sysfs_get_dirent.

Signed-off-by: NeilBrown <neilb@suse.de>
This commit is contained in:
NeilBrown
2010-05-22 08:31:36 +10:00
parent be6800a73a 3ff195b011
commit 19fdb9eefb
9962 changed files with 488175 additions and 200643 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/md/multipath.c
+1
View File
@@ -22,6 +22,7 @@
#include <linux/blkdev.h>
#include <linux/raid/md_u.h>
#include <linux/seq_file.h>
#include <linux/slab.h>
#include "md.h"
#include "multipath.h"