The patch titled
Doc: isicom, remove reserved ioctl-number
has been removed from the -mm tree. Its filename was
doc-isicom-remove-reserved-ioctl-number.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: Doc: isicom, remove reserved ioctl-number
From: Jiri Slaby <jirislaby@xxxxxxxxx>
Isicom driver no longer registers chardev with ioctl function. It used to
use for firmware loading. Remove the reserved letter (M) from
ioctl-number, so that the conflict get away.
Signed-off-by: Jiri Slaby <jirislaby@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
Documentation/ioctl-number.txt | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff -puN Documentation/ioctl-number.txt~doc-isicom-remove-reserved-ioctl-number Documentation/ioctl-number.txt
--- a/Documentation/ioctl-number.txt~doc-isicom-remove-reserved-ioctl-number
+++ a/Documentation/ioctl-number.txt
@@ -94,8 +94,7 @@ Code Seq# Include File Comments
'L' 00-1F linux/loop.h
'L' E0-FF linux/ppdd.h encrypted disk device driver
<http://linux01.gwdg.de/~alatham/ppdd.html>
-'M' all linux/soundcard.h conflict!
-'M' 00-1F linux/isicom.h conflict!
+'M' all linux/soundcard.h
'N' 00-1F drivers/usb/scanner.h
'P' all linux/soundcard.h
'Q' all linux/soundcard.h
_
Patches currently in -mm which might be from jirislaby@xxxxxxxxx are
origin.patch
char-use-more-pci_device-macro.patch
char-cyclades-use-pci_device_id.patch
maintainers-remove-two-dead-e-mail.patch
char-specialix-isr-have-2-params.patch
char-timers-cleanup.patch
fbdev-driver-for-s3-trio-virge-update-2-fix.patch
video-fb-add-true-ref_count-atomicity.patch
video-fb-kzalloc-changes.patch
shrink_slab-handle-bad-shrinkers.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
