The patch titled don't export device IDs to userspace has been added to the -mm tree. Its filename is dont-export-device-ids-to-userspace.patch See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: don't export device IDs to userspace From: Adrian Bunk <bunk@xxxxxxxxx> I don't see any good reason for exporting device IDs to userspace. Signed-off-by: Adrian Bunk <bunk@xxxxxxxxx> Acked-by: Greg Kroah-Hartman <gregkh@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- include/linux/Kbuild | 2 -- include/linux/pci.h | 6 +++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff -puN include/linux/Kbuild~dont-export-device-ids-to-userspace include/linux/Kbuild --- a/include/linux/Kbuild~dont-export-device-ids-to-userspace +++ a/include/linux/Kbuild @@ -122,7 +122,6 @@ header-y += nfs4_mount.h header-y += nfs_mount.h header-y += oom.h header-y += param.h -header-y += pci_ids.h header-y += pci_regs.h header-y += personality.h header-y += pfkeyv2.h @@ -165,7 +164,6 @@ header-y += vt.h header-y += wireless.h header-y += xattr.h header-y += x25.h -header-y += zorro_ids.h unifdef-y += acct.h unifdef-y += adb.h diff -puN include/linux/pci.h~dont-export-device-ids-to-userspace include/linux/pci.h --- a/include/linux/pci.h~dont-export-device-ids-to-userspace +++ a/include/linux/pci.h @@ -20,9 +20,6 @@ /* Include the pci register defines */ #include <linux/pci_regs.h> -/* Include the ID list */ -#include <linux/pci_ids.h> - /* * The PCI interface treats multi-function devices as independent * devices. The slot/function address of each device is encoded @@ -54,6 +51,9 @@ #include <asm/atomic.h> #include <linux/device.h> +/* Include the ID list */ +#include <linux/pci_ids.h> + /* File state for mmap()s on /proc/bus/pci/X/Y */ enum pci_mmap_state { pci_mmap_io, _ Patches currently in -mm which might be from bunk@xxxxxxxxx are make-drivers-acpi-baycdrive_bays-static.patch make-drivers-acpi-eccec_ecdt-static.patch drivers-acpi-oslc-fix-a-null-check.patch git-alsa.patch git-dvb.patch git-gfs2-nmw.patch fs-dlm-lowcomms-tcpc-remove-2-functions.patch git-mtd.patch git-net.patch net-possible-cleanups.patch net-possible-cleanups-fix.patch net-possible-cleanups-fix-2.patch net-uninline-skb_put-fix.patch git-ocfs2.patch dont-export-device-ids-to-userspace.patch git-scsi-misc.patch drivers-scsi-small-cleanups.patch drivers-scsi-aic7xxx-aic79xx_corec-make-ahd_match_scb-static.patch drivers-scsi-advansysc-cleanups.patch megaraid-fix-warnings-when-config_proc_fs=n.patch drivers-scsi-dpt_i2oc-remove-dead-code.patch drivers-scsi-aic7xxx-make-functions-static.patch make-qla2x00_reg_remote_port-static.patch arch-i386-kernel-remove-remaining-pc98-code.patch cleanup-arch-i386-kernel-smpbootcsmp_tune_scheduling.patch git-cryptodev.patch make-mm-thrashcglobal_faults-static.patch acx1xx-wireless-driver.patch drivers-edac-make-code-static.patch remove-drivers-pci-searchcpci_find_device_reverse.patch ext4_ext_split-remove-dead-code.patch the-scheduled-removal-of-some-oss-options.patch make-mm-shmemcshmem_xattr_security_handler-static.patch remove-kernel-lockdepclockdep_internal.patch make-kernel-signalckill_proc_info-static.patch make-ecryptfs_version_str_map-static.patch make-fs-jbd-transactionc__journal_temp_unlink_buffer-static.patch make-fs-jbd2-transactionc__jbd2_journal_temp_unlink_buffer-static.patch fs-lockd-hostc-make-2-functions-static.patch make-fs-proc-basecproc_pid_instantiate-static.patch better-config_w1_slave_ds2433_crc-handling.patch fs-sysv-doc-cleanup.patch proper-prototype-for-remove_inode_dquot_ref.patch remove-drivers-char-riscom8cbaud_table.patch arch-i386-kernel-rebootc-should-include-linux-rebooth.patch remove-export_unused_symboled-symbols.patch make-ext2_get_blocks-static.patch generic-bug-implementation-include-linux-bugh-must-always-include-linux-moduleh.patch fsstack-introduce-fsstack_copy_attrinode_-fs-stackc-should-include-linux-fs_stackh.patch i4l-remove-the-broken-hisax_amd7930-option.patch readahead-events-accounting-make-readahead_debug_level-static.patch reiser4-export-remove_from_page_cache-fix.patch fs-reiser4-possible-cleanups.patch reiser4-possible-cleanups-2.patch fs-reiser4-possible-cleanups-2.patch fs-reiser4-more-possible-cleanups.patch make-drivers-md-dm-snapcksnapd-static.patch gtod-persistent-clock-support-core-remove-kernel-timercwall_jiffies.patch gtod-persistent-clock-support-i386-i386-unexport-read_persistent_clock.patch dynticks-extend-next_timer_interrupt-to-use-a-reference-jiffie-make-kernel-timerc__next_timer_interrupt-static.patch updated-i386-convert-to-clock-event-devices-arch-i386-kernel-apicc-make-a-function-static.patch updated-i386-convert-to-clock-event-devices-remove-arch-i386-kernel-time_hpetchpet_reenable.patch slim-main-patch-security-slim-slm_mainc-make-2-functions-static.patch slab-cache-shrinker-statistics.patch debug-shared-irqs-kconfig-fix.patch i386-enable-4k-stacks-by-default.patch mutex-subsystem-synchro-test-module.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