From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Neil Brown <neilb@suse•de>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Arnd Bergmann <arnd@arndb•de>
Subject: linux-next: manual merge of the md-current tree with Linus' tree
Date: Mon, 14 Dec 2009 10:24:28 +1100 [thread overview]
Message-ID: <20091214102428.f50557a0.sfr@canb.auug.org.au> (raw)
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@canb•auug.org.au
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)
next reply other threads:[~2009-12-13 23:24 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-12-13 23:24 Stephen Rothwell [this message]
2009-12-14 10:27 ` linux-next: manual merge of the md-current tree with Linus' tree Arnd Bergmann
2009-12-15 3:05 ` Neil Brown
2009-12-15 9:57 ` Arnd Bergmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20091214102428.f50557a0.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=arnd@arndb$(echo .)de \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=neilb@suse$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox