The patch titled drivers/pps/sysfs.c: make dev_attr_name static has been added to the -mm tree. Its filename is linuxpps-core-support-drivers-pps-sysfsc-make-dev_attr_name-static.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: drivers/pps/sysfs.c: make dev_attr_name static From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Fix things like this: drivers/hwmon/built-in.o:(.data+0x8e60): multiple definition of `dev_attr_name' drivers/pps/built-in.o:(.data+0x160): first defined here Reported-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx> Cc: Rodolfo Giometti <giometti@xxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/pps/sysfs.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff -puN drivers/pps/sysfs.c~linuxpps-core-support-drivers-pps-sysfsc-make-dev_attr_name-static drivers/pps/sysfs.c --- a/drivers/pps/sysfs.c~linuxpps-core-support-drivers-pps-sysfsc-make-dev_attr_name-static +++ a/drivers/pps/sysfs.c @@ -41,7 +41,7 @@ static ssize_t pps_show_assert(struct de (long long) pps->assert_tu.sec, pps->assert_tu.nsec, pps->assert_sequence); } -DEVICE_ATTR(assert, S_IRUGO, pps_show_assert, NULL); +static DEVICE_ATTR(assert, S_IRUGO, pps_show_assert, NULL); static ssize_t pps_show_clear(struct device *dev, struct device_attribute *attr, char *buf) @@ -55,7 +55,7 @@ static ssize_t pps_show_clear(struct dev (long long) pps->clear_tu.sec, pps->clear_tu.nsec, pps->clear_sequence); } -DEVICE_ATTR(clear, S_IRUGO, pps_show_clear, NULL); +static DEVICE_ATTR(clear, S_IRUGO, pps_show_clear, NULL); static ssize_t pps_show_mode(struct device *dev, struct device_attribute *attr, char *buf) @@ -64,7 +64,7 @@ static ssize_t pps_show_mode(struct devi return sprintf(buf, "%4x\n", pps->info.mode); } -DEVICE_ATTR(mode, S_IRUGO, pps_show_mode, NULL); +static DEVICE_ATTR(mode, S_IRUGO, pps_show_mode, NULL); static ssize_t pps_show_echo(struct device *dev, struct device_attribute *attr, char *buf) @@ -73,7 +73,7 @@ static ssize_t pps_show_echo(struct devi return sprintf(buf, "%d\n", !!pps->info.echo); } -DEVICE_ATTR(echo, S_IRUGO, pps_show_echo, NULL); +static DEVICE_ATTR(echo, S_IRUGO, pps_show_echo, NULL); static ssize_t pps_show_name(struct device *dev, struct device_attribute *attr, char *buf) @@ -82,7 +82,7 @@ static ssize_t pps_show_name(struct devi return sprintf(buf, "%s\n", pps->info.name); } -DEVICE_ATTR(name, S_IRUGO, pps_show_name, NULL); +static DEVICE_ATTR(name, S_IRUGO, pps_show_name, NULL); static ssize_t pps_show_path(struct device *dev, struct device_attribute *attr, char *buf) @@ -91,7 +91,7 @@ static ssize_t pps_show_path(struct devi return sprintf(buf, "%s\n", pps->info.path); } -DEVICE_ATTR(path, S_IRUGO, pps_show_path, NULL); +static DEVICE_ATTR(path, S_IRUGO, pps_show_path, NULL); struct device_attribute pps_attrs[] = { __ATTR(assert, S_IRUGO, pps_show_assert, NULL), _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are epoll-introduce-resource-usage-limits.patch epoll-introduce-resource-usage-limits-update-refix.patch mm-remove-the-might_sleep-from-lock_page.patch make-linx-next-apply.patch linux-next.patch next-remove-localversion.patch drivers-hwmon-f71882fgc-make-dev_attr_name-static.patch tick-schedc-suppress-needless-timer-reprogramming.patch linux-timexh-cleanup-for-userspace.patch drivers-input-touchscreen-ucb1400_tsc-needs-gpio.patch input-ad7879-fix-workaroud-build-error-reported-by-andrew-morton.patch backlight-catch-invalid-input-checkpatch-fixes.patch backlight-catch-invalid-input-fix.patch pci-uninline-pci_ioremap_bar.patch pcie-add-option-to-passively-listen-for-pcie-hotplug-events-checkpatch-fixes.patch vfs-lseekfd-0-seek_cur-race-condition-fix.patch ntfs-dont-fool-kernel-doc-checkpatch-fixes.patch bdi-register-sysfs-bdi-device-only-once-per-queue-fix.patch scsi-dpt_i2o-is-bust-on-ia64.patch netdev-smc911x-fix-for-driver-resume-cleanup.patch mm-invoke-oom-killer-from-page-fault-fix.patch mm-invoke-oom-killer-from-page-fault-fix-fix-2.patch mm-write_cache_pages-more-terminate-quickly.patch init-properly-placing-noinline-keyword.patch add-pr_prefix-to-pr_xyz-macros-checkpatch-fixes.patch poll-allow-f_op-poll-to-sleep-take6.patch binfmtsh-include-listh-fix.patch max3100-spi-uart-driver-select-serial_core-fix.patch spi_gpio-driver-cleanups.patch kprobes-support-probing-module-__exit-function-fix.patch kprobes-support-probing-module-__exit-function-fix-2.patch rtc-au1000-on-chip-counter0-as-rtc-driver-fix.patch memcg-introduce-charge-commit-cancel-style-of-functions-fix.patch memcg-new-force_empty-to-free-pages-under-group-fix-fix.patch memcg-swap-cgroup-for-remembering-usage.patch memory-cgroup-resource-counters-for-hierarchy-v4-checkpatch-fixes.patch memory-cgroup-hierarchical-reclaim-v4-checkpatch-fixes.patch memcg-avoid-unnecessary-system-wide-oom-killer-fix.patch edac-struct-device-replace-bus_id-with-dev_name-dev_set_name-checkpatch-fixes.patch edac-x38-use-the-architectures-readq-function-fix.patch filesystem-freeze-implement-generic-freeze-feature-fix.patch linuxpps-core-support-drivers-pps-sysfsc-make-dev_attr_name-static.patch nilfs2-inode-operations-fix.patch nilfs2-pathname-operations-fix.patch nilfs2-super-block-operations-fix.patch reiser4.patch reiser4-tree_lock-fixes.patch reiser4-tree_lock-fixes-fix.patch reiser4-semaphore-fix.patch slb-drop-kmem-cache-argument-from-constructor-reiser4.patch reiser4-suid.patch reiser4-track-upstream-changes.patch reiser4-remove-simple_prepare_write-usage-checkpatch-fixes.patch nr_blockdev_pages-in_interrupt-warning.patch slab-leaks3-default-y.patch put_bh-debug.patch shrink_slab-handle-bad-shrinkers.patch getblk-handle-2tb-devices.patch getblk-handle-2tb-devices-fix.patch undeprecate-pci_find_device.patch notify_change-callers-must-hold-i_mutex.patch drivers-net-bonding-bond_sysfsc-suppress-uninitialized-var-warning.patch w1-build-fix.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