linux-next: manual merge of the md-current tree with Linus' tree

[Stephen Rothwell]

Hi Neil,

Today's linux-next merge of the md-current tree got a conflict in
fs/compat_ioctl.c between commit 789f0f89118a80a3ff5309371e5820f623ed2a53
("compat_ioctl: simplify calling of handlers") from Linus' tree and
commit 22cc6029b064a3232d6b5a7c03c805ba02afc6db ("md: move compat_ioctl
handling into md.c") from the md-current tree.

I fixed it up (see below) and can carry the fix for a while  (a merge
with Linus' tree should fix it).
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc fs/compat_ioctl.c
index 278020d,ad485ba..0000000
--- a/fs/compat_ioctl.c
+++ b/fs/compat_ioctl.c
@@@ -979,29 -1912,22 +979,11 @@@ COMPATIBLE_IOCTL(FIGETBSZ
  /* 'X' - originally XFS but some now in the VFS */
  COMPATIBLE_IOCTL(FIFREEZE)
  COMPATIBLE_IOCTL(FITHAW)
- /* RAID */
- COMPATIBLE_IOCTL(RAID_VERSION)
- COMPATIBLE_IOCTL(GET_ARRAY_INFO)
- COMPATIBLE_IOCTL(GET_DISK_INFO)
- COMPATIBLE_IOCTL(PRINT_RAID_DEBUG)
- COMPATIBLE_IOCTL(RAID_AUTORUN)
- COMPATIBLE_IOCTL(CLEAR_ARRAY)
- COMPATIBLE_IOCTL(ADD_NEW_DISK)
- COMPATIBLE_IOCTL(SET_ARRAY_INFO)
- COMPATIBLE_IOCTL(SET_DISK_INFO)
- COMPATIBLE_IOCTL(WRITE_RAID_INFO)
- COMPATIBLE_IOCTL(UNPROTECT_ARRAY)
- COMPATIBLE_IOCTL(PROTECT_ARRAY)
- COMPATIBLE_IOCTL(RUN_ARRAY)
- COMPATIBLE_IOCTL(STOP_ARRAY)
- COMPATIBLE_IOCTL(STOP_ARRAY_RO)
- COMPATIBLE_IOCTL(RESTART_ARRAY_RW)
- COMPATIBLE_IOCTL(GET_BITMAP_FILE)
 -/* Big K */
 -COMPATIBLE_IOCTL(PIO_FONT)
 -COMPATIBLE_IOCTL(GIO_FONT)
 -COMPATIBLE_IOCTL(PIO_CMAP)
 -COMPATIBLE_IOCTL(GIO_CMAP)
 -ULONG_IOCTL(KDSIGACCEPT)
  COMPATIBLE_IOCTL(KDGETKEYCODE)
  COMPATIBLE_IOCTL(KDSETKEYCODE)
 -ULONG_IOCTL(KIOCSOUND)
 -ULONG_IOCTL(KDMKTONE)
  COMPATIBLE_IOCTL(KDGKBTYPE)
 -ULONG_IOCTL(KDSETMODE)
  COMPATIBLE_IOCTL(KDGETMODE)
 -ULONG_IOCTL(KDSKBMODE)
  COMPATIBLE_IOCTL(KDGKBMODE)
 -ULONG_IOCTL(KDSKBMETA)
  COMPATIBLE_IOCTL(KDGKBMETA)
  COMPATIBLE_IOCTL(KDGKBENT)
  COMPATIBLE_IOCTL(KDSKBENT)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/