This is a note to let you know that I've just added the patch titled
PCI: Rename sysfs 'enabled' file back to 'enable'
to the 3.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
pci-rename-sysfs-enabled-file-back-to-enable.patch
and it can be found in the queue-3.14 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From d8e7d53a2fc14e0830ab728cb84ee19933d3ac8d Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
Date: Thu, 30 Oct 2014 09:30:28 -0700
Subject: PCI: Rename sysfs 'enabled' file back to 'enable'
From: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
commit d8e7d53a2fc14e0830ab728cb84ee19933d3ac8d upstream.
Back in commit 5136b2da770d ("PCI: convert bus code to use dev_groups"),
I misstyped the 'enable' sysfs filename as 'enabled', which broke the
userspace API. This patch fixes that issue by renaming the file back.
Fixes: 5136b2da770d ("PCI: convert bus code to use dev_groups")
Reported-by: Jeff Epler <jepler@xxxxxxxxxxxxxx>
Tested-by: Jeff Epler <jepler@xxxxxxxxxxxxxx> # on v3.14-rt
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Bjorn Helgaas <bhelgaas@xxxxxxxxxx>
---
drivers/pci/pci-sysfs.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
--- a/drivers/pci/pci-sysfs.c
+++ b/drivers/pci/pci-sysfs.c
@@ -186,9 +186,9 @@ static ssize_t modalias_show(struct devi
}
static DEVICE_ATTR_RO(modalias);
-static ssize_t enabled_store(struct device *dev,
- struct device_attribute *attr, const char *buf,
- size_t count)
+static ssize_t enable_store(struct device *dev,
+ struct device_attribute *attr, const char *buf,
+ size_t count)
{
struct pci_dev *pdev = to_pci_dev(dev);
unsigned long val;
@@ -212,15 +212,15 @@ static ssize_t enabled_store(struct devi
return result < 0 ? result : count;
}
-static ssize_t enabled_show(struct device *dev,
- struct device_attribute *attr, char *buf)
+static ssize_t enable_show(struct device *dev,
+ struct device_attribute *attr, char *buf)
{
struct pci_dev *pdev;
pdev = to_pci_dev (dev);
return sprintf (buf, "%u\n", atomic_read(&pdev->enable_cnt));
}
-static DEVICE_ATTR_RW(enabled);
+static DEVICE_ATTR_RW(enable);
#ifdef CONFIG_NUMA
static ssize_t
@@ -526,7 +526,7 @@ static struct attribute *pci_dev_attrs[]
#endif
&dev_attr_dma_mask_bits.attr,
&dev_attr_consistent_dma_mask_bits.attr,
- &dev_attr_enabled.attr,
+ &dev_attr_enable.attr,
&dev_attr_broken_parity_status.attr,
&dev_attr_msi_bus.attr,
#if defined(CONFIG_PM_RUNTIME) && defined(CONFIG_ACPI)
Patches currently in stable-queue which might be from gregkh@xxxxxxxxxxxxxxxxxxx are
queue-3.14/spi-fsl-dspi-fix-ctar-selection.patch
queue-3.14/target-fix-queue-full-status-null-pointer-for-scf_transport_task_sense.patch
queue-3.14/dm-bufio-when-done-scanning-return-from-__scan-immediately.patch
queue-3.14/mnt-prevent-pivot_root-from-creating-a-loop-in-the-mount-tree.patch
queue-3.14/usb-option-add-haier-ce81b-cdma-modem.patch
queue-3.14/media-em28xx-check-if-a-device-has-audio-earlier.patch
queue-3.14/revert-percpu-free-percpu-allocation-info-for-uniprocessor-system.patch
queue-3.14/fs-allow-open-dir-o_tmpfile-...-0-with-mode-0.patch
queue-3.14/input-i8042-quirks-for-fujitsu-lifebook-a544-and-lifebook-ah544.patch
queue-3.14/hid-usbhid-enable-always-poll-quirk-for-elan-touchscreen-009b.patch
queue-3.14/kvm-x86-emulator-fixes-for-eip-canonical-checks-on-near-branches.patch
queue-3.14/pci-rename-sysfs-enabled-file-back-to-enable.patch
queue-3.14/kvm-vmx-handle-invvpid-vm-exit-gracefully.patch
queue-3.14/mmc-rtsx_pci_sdmmc-fix-incorrect-last-byte-in-r2-response.patch
queue-3.14/mm-memcontrol-do-not-iterate-uninitialized-memcgs.patch
queue-3.14/ext3-don-t-check-quota-format-when-there-are-no-quota-files.patch
queue-3.14/revert-iwlwifi-mvm-treat-eapols-like-mgmt-frames-wrt-rate.patch
queue-3.14/intel_pstate-fix-byt-frequency-reporting.patch
queue-3.14/kvm-x86-prevent-host-from-panicking-on-shared-msr-writes.patch
queue-3.14/selinux-fix-inode-security-list-corruption.patch
queue-3.14/drm-vmwgfx-fix-drm.h-include.patch
queue-3.14/oom-pm-oom-killed-task-shouldn-t-escape-pm-suspend.patch
queue-3.14/usb-musb-cppi41-restart-hrtimer-only-if-not-yet-done.patch
queue-3.14/ext4-check-s_chksum_driver-when-looking-for-bg-csum-presence.patch
queue-3.14/wireless-rt2x00-add-new-rt2800usb-device.patch
queue-3.14/usb-opticon-fix-non-atomic-allocation-in-write-path.patch
queue-3.14/block-fix-alignment_offset-math-that-assumes-io_min-is-a-power-of-2.patch
queue-3.14/usb-phy-return-enodev-on-failure-of-try_module_get.patch
queue-3.14/cgroup-kmemleak-add-kmemleak_free-for-cgroup-deallocations.patch
queue-3.14/usb-do-not-allow-usb_alloc_streams-on-unconfigured-devices.patch
queue-3.14/cpc925_edac-report-ue-events-properly.patch
queue-3.14/power-charger-manager-fix-null-pointer-exception-with-missing-cm-fuel-gauge.patch
queue-3.14/usb-kobil_sct-fix-non-atomic-allocation-in-write-path.patch
queue-3.14/media-tda7432-fix-setting-tda7432_mute-bit-for-tda7432_rf-register.patch
queue-3.14/kvm-x86-check-non-canonical-addresses-upon-wrmsr.patch
queue-3.14/hid-usbhid-enable-always-poll-quirk-for-elan-touchscreen-016f.patch
queue-3.14/cpufreq-expose-scaling_cur_freq-sysfs-file-for-set_policy-drivers.patch
queue-3.14/fs-fix-theoretical-division-by-0-in-super_cache_scan.patch
queue-3.14/x86-reject-x32-executables-if-x32-abi-not-supported.patch
queue-3.14/x86-pageattr-prevent-overflow-in-slow_virt_to_phys-for-x86_pae.patch
queue-3.14/evm-check-xattr-value-length-and-type-in-evm_inode_setxattr.patch
queue-3.14/mfd-rtsx_pcr-fix-msi-enable-error-handling.patch
queue-3.14/drivers-net-macvtap-and-tun-depend-on-inet.patch
queue-3.14/mm-free-compound-page-with-correct-order.patch
queue-3.14/hid-usbhid-add-always-poll-quirk.patch
queue-3.14/ext4-check-ea-value-offset-when-loading.patch
queue-3.14/target-fix-aptpl-metadata-handling-for-dynamic-mappedluns.patch
queue-3.14/spi-pxa2xx-toggle-clocks-on-suspend-if-not-disabled-by-runtime-pm.patch
queue-3.14/x86-iosf-added-quark-mbi-identifiers.patch
queue-3.14/usb-quirks-enable-device-qualifier-quirk-for-another-elan-touchscreen.patch
queue-3.14/xfs-avoid-false-quotacheck-after-unclean-shutdown.patch
queue-3.14/qla_target-don-t-delete-changed-nacls.patch
queue-3.14/modules-lock-around-setting-of-module_state_unformed.patch
queue-3.14/input-i8042-add-noloop-quirk-for-asus-x750ln.patch
queue-3.14/x86_64-entry-filter-rflags.nt-on-entry-from-userspace.patch
queue-3.14/usb-quirks-enable-device-qualifier-quirk-for-yet-another-elan-touchscreen.patch
queue-3.14/sunrpc-add-missing-support-for-rpc_clnt_create_no_retrans_timeout.patch
queue-3.14/media-v4l2-common-fix-overflow-in-v4l_bound_align_image.patch
queue-3.14/arc-update-order-of-registers-in-kgdb-to-match-gdb-7.5.patch
queue-3.14/ubifs-remove-mst_mutex.patch
queue-3.14/usb-cdc-acm-add-device-id-for-gw-instek-afg-2225.patch
queue-3.14/tracing-syscalls-ignore-numbers-outside-nr_syscalls-range.patch
queue-3.14/alsa-hda-add-codec-id-for-braswell-display-audio-codec.patch
queue-3.14/cpufreq-intel_pstate-fix-setting-max_perf_pct-in-performance-policy.patch
queue-3.14/fs-make-cont_expand_zero-interruptible.patch
queue-3.14/ipv4-fix-nexthop-attlen-check-in-fib_nh_match.patch
queue-3.14/sunrpc-don-t-wake-tasks-during-connection-abort.patch
queue-3.14/qxl-don-t-create-too-large-primary-surface.patch
queue-3.14/scsi-fix-error-handling-in-scsi_ioctl_send_command.patch
queue-3.14/pata_serverworks-disable-64-kb-dma-transfers-on-broadcom-osb4-ide-controller.patch
queue-3.14/media-m88ts2022-fix-32bit-overflow-on-filter-calc.patch
queue-3.14/virtio_pci-fix-virtio-spec-compliance-on-restore.patch
queue-3.14/libata-sff-fix-controllers-with-no-ctl-port.patch
queue-3.14/x86_64-entry-fix-out-of-bounds-read-on-sysenter.patch
queue-3.14/hid-usbhid-enable-always-poll-quirk-for-elan-touchscreen.patch
queue-3.14/vxlan-fix-a-use-after-free-in-vxlan_encap_bypass.patch
queue-3.14/pstore-fix-duplicate-console-ftrace-efi-entries.patch
queue-3.14/ext4-fix-reservation-overflow-in-ext4_da_write_begin.patch
queue-3.14/serial-fix-divide-by-zero-fault-in-uart_get_divisor.patch
queue-3.14/mfd-ti_am335x_tscadc-fix-tsc-operation-after-adc-continouous-mode.patch
queue-3.14/libceph-ceph-msgr-workqueue-needs-a-resque-worker.patch
queue-3.14/x86-platform-intel-iosf-add-braswell-pci-id.patch
queue-3.14/sched-use-dl_bw_of-under-rcu-read-lock.patch
queue-3.14/drivers-net-ipv6-select-ipv6-fragment-idents-for-virtio-ufo-packets.patch
queue-3.14/staging-iio-ad5933-fix-null-pointer-deref-when-enabling-buffer.patch
queue-3.14/drm-cirrus-bind-also-to-qemu-xen-traditional.patch
queue-3.14/usb-musb-dsps-start-otg-timer-on-resume-again.patch
queue-3.14/ext4-don-t-check-quota-format-when-there-are-no-quota-files.patch
queue-3.14/jbd2-free-bh-when-descriptor-block-checksum-fails.patch
queue-3.14/kvm-x86-don-t-kill-guest-on-unknown-exit-reason.patch
queue-3.14/kvm-x86-improve-thread-safety-in-pit.patch
queue-3.14/asoc-tlv320aic3x-fix-pll-d-configuration.patch
queue-3.14/framebuffer-fix-border-color.patch
queue-3.14/x86-fpu-__restore_xstate_sig-math_state_restore-needs-preempt_disable.patch
queue-3.14/lib-bitmap.c-fix-undefined-shift-in-__bitmap_shift_-left-right.patch
queue-3.14/arc-general-fixes.patch
queue-3.14/alsa-pcm-zero-clear-reserved-fields-of-pcm-status-ioctl-in-compat-mode.patch
queue-3.14/usb-option-add-support-for-telit-le910.patch
queue-3.14/ext4-fix-oops-when-loading-block-bitmap-failed.patch
queue-3.14/rt2x00-support-ralink-5362.patch
queue-3.14/vfs-fix-data-corruption-when-blocksize-pagesize-for-mmaped-data.patch
queue-3.14/fix-misuses-of-f_count-in-ppp-and-netlink.patch
queue-3.14/alsa-usb-audio-fix-device_del-sysfs-warnings-at-disconnect.patch
queue-3.14/ubifs-fix-free-log-space-calculation.patch
queue-3.14/usb-core-add-device-qualifier-quirk.patch
queue-3.14/media-usb-uvc-add-a-quirk-for-dell-xps-m1330-webcam.patch
queue-3.14/x86-fpu-shift-drop_init_fpu-from-save_xstate_sig-to-handle_signal.patch
queue-3.14/dm-bufio-update-last_accessed-when-relinking-a-buffer.patch
queue-3.14/cpufreq-intel_pstate-add-cpu-id-for-braswell-processor.patch
queue-3.14/wireless-rt2x00-add-new-rt2800usb-devices.patch
queue-3.14/media-em28xx-v4l-give-back-all-active-video-buffers-to-the-vb2-core-properly-on-streaming-stop.patch
queue-3.14/staging-iio-ade7758-fix-check-if-channels-are-enabled-in-prenable.patch
queue-3.14/usb-quirks-enable-device-qualifier-quirk-for-elan-touchscreen.patch
queue-3.14/arc-allow-headless-models-to-boot.patch
queue-3.14/drm-ast-fix-hw-cursor-image.patch
queue-3.14/nfsd4-fix-crash-on-unknown-operation-number.patch
queue-3.14/tcp-md5-do-not-use-alloc_percpu.patch
queue-3.14/drm-i915-don-t-warn-if-backlight-unexpectedly-enabled.patch
queue-3.14/ext4-replace-open-coded-mdata-csum-feature-to-helper-function.patch
queue-3.14/usb-serial-ftdi_sio-add-awinda-station-and-dongle-products.patch
queue-3.14/lockd-try-to-reconnect-if-statd-has-moved.patch
queue-3.14/dm-log-userspace-fix-memory-leak-in-dm_ulog_tfr_init-failure-path.patch
queue-3.14/mips-ftrace-fix-a-micromips-build-problem.patch
queue-3.14/usb-serial-cp210x-add-silicon-labs-358x-vid-and-pid.patch
queue-3.14/mfd-ti_am335x_tscadc-fix-tsc-resume.patch
queue-3.14/um-ubd-fix-for-processes-stuck-in-d-state-forever.patch
queue-3.14/usb-storage-handle-a-skipped-data-phase.patch
queue-3.14/ubifs-fix-a-race-condition.patch
queue-3.14/ipv4-fix-a-potential-use-after-free-in-ip_tunnel_core.c.patch
queue-3.14/i82860_edac-report-ce-events-properly.patch
queue-3.14/asoc-soc-dapm-fix-use-after-free.patch
queue-3.14/staging-iio-ad5933-drop-raw-from-channel-names.patch
queue-3.14/intel_pstate-add-cpu-ids-for-broadwell-processors.patch
queue-3.14/kvm-fix-excessive-pages-un-pinning-in-kvm_iommu_map-error-path.patch
queue-3.14/ubi-add-missing-kmem_cache_free-in-process_pool_aeb-error-path.patch
queue-3.14/ext4-fix-mmap-data-corruption-when-blocksize-pagesize.patch
queue-3.14/x86-iosf-make-iosf-driver-modular-and-usable-by-more-drivers.patch
queue-3.14/drm-nouveau-bios-memset-dcb-struct-to-zero-before-parsing.patch
queue-3.14/arc-disable-caches-in-early-boot-if-so-configured.patch
queue-3.14/intel_pstate-correct-byt-vid-values.patch
queue-3.14/usb-cdc-acm-only-raise-dtr-on-transitions-from-b0.patch
queue-3.14/i3200_edac-report-ce-events-properly.patch
queue-3.14/missing-data-dependency-barrier-in-prepend_name.patch
queue-3.14/x86-iosf-add-quark-x1000-pci-id.patch
queue-3.14/ext4-add-ext4_iget_normal-which-is-to-be-used-for-dir-tree-lookups.patch
queue-3.14/drivers-net-disable-ufo-through-virtio.patch
queue-3.14/staging-iio-ade7758-fix-null-pointer-deref-when-enabling-buffer.patch
queue-3.14/iio-st_sensors-fix-buffer-copy.patch
queue-3.14/media-ds3000-fix-lnb-supply-voltage-on-tevii-s480-on-initialization.patch
queue-3.14/ax88179_178a-fix-bonding-failure.patch
queue-3.14/spi-pl022-fix-incorrect-dma_unmap_sg.patch
queue-3.14/evm-properly-handle-integrity_noxattrs-evm-status.patch
queue-3.14/usb-remove-references-to-non-existent-plat_s5p-symbol.patch
queue-3.14/vxlan-fix-a-free-after-use.patch
queue-3.14/xen-blkback-fix-leak-on-grant-map-error-path.patch
queue-3.14/kvm-x86-fix-wrong-masking-on-relative-jump-call.patch
queue-3.14/ipv4-dst_entry-leak-in-ip_send_unicast_reply.patch
queue-3.14/kill-wbuf_queued-wbuf_dwork_lock.patch
queue-3.14/e7xxx_edac-report-ce-events-properly.patch
queue-3.14/alsa-hda-add-pci-ids-for-intel-braswell.patch
queue-3.14/usb-dwc3-gadget-properly-initialize-link-trb.patch
queue-3.14/random-add-and-use-memzero_explicit-for-clearing-data.patch
queue-3.14/mmc-sdhci-pci-sdio-host-controller-support-for-intel-quark.patch
queue-3.14/drbd-compute-the-end-before-rb_insert_augmented.patch
queue-3.14/freezer-do-not-freeze-tasks-killed-by-oom-killer.patch
queue-3.14/mips-tlbex-properly-fix-huge-tlb-refill-exception-handler.patch
queue-3.14/ext4-fix-overflow-when-updating-superblock-backups-after-resize.patch
queue-3.14/ext4-enable-journal-checksum-when-metadata-checksum-feature-enabled.patch
queue-3.14/usb-serial-ftdi_sio-add-bricked-ftdi-device-pid.patch
queue-3.14/gre-use-inner-mac-length-when-computing-tunnel-length.patch
queue-3.14/staging-iio-ade7758-remove-raw-from-channel-name.patch
queue-3.14/sh-fix-sh770x-scif-memory-regions.patch
queue-3.14/vxlan-using-pskb_may_pull-as-early-as-possible.patch
queue-3.14/ext4-grab-missed-write_count-for-ext4_ioc_swap_boot.patch
queue-3.14/drm-tilcdc-fix-the-error-path-in-tilcdc_load.patch
queue-3.14/x86-iosf-add-pci-id-macros-for-better-readability.patch
queue-3.14/x86-add-cpu_detect_cache_sizes-to-init_intel-add-quark-legacy_cache.patch
queue-3.14/arc-fix-mmuv2-warning.patch
queue-3.14/quota-properly-return-errors-from-dquot_writeback_dquots.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html