Changes in sysfs-devices-power_resources_D1

e5451c8f8330e03ad3cfa16048b4daf961af434f - Merge remote-tracking branch 'linusw-gpio/for-next' into devm_gpiochip

Tue, 23 Feb 2016 15:07:08 +0100

Merge remote-tracking branch 'linusw-gpio/for-next' into devm_gpiochipBase for demv_gpiochip_add_data() and devm_gpiochip_remove(). List of files: /linux/Documentation/ABI/testing/sysfs-devices-power_resources_D1

bf61c8840efe60fd8f91446860b63338fb424158 - Merge branch 'next' into for-linus

Wed, 01 May 2013 17:47:44 +0200

Merge branch 'next' into for-linusPrepare first set of updates for 3.10 merge window. List of files: /linux/Documentation/ABI/testing/sysfs-devices-power_resources_D1

f53f292eeaa234615c31a1306babe703fc4263f2 - Merge remote-tracking branch 'efi/chainsaw' into x86/efi

Sat, 20 Apr 2013 18:16:44 +0200

Merge remote-tracking branch 'efi/chainsaw' into x86/efiResolved Conflicts: drivers/firmware/efivars.c fs/efivarsfs/file.cSigned-off-by: H. Peter Anvin List of files: /linux/Documentation/ABI/testing/sysfs-devices-power_resources_D1

dca3a783400a18e2bf4503b1d4a85c4d0ca1a7e4 - Merge commit '31d9adca82ce65e5c99d045b5fd917c702b6fce3' into tmp

Mon, 01 Apr 2013 21:33:50 +0200

Merge commit '31d9adca82ce65e5c99d045b5fd917c702b6fce3' into tmpConflicts: arch/arm/plat-omap/dmtimer.c List of files: /linux/Documentation/ABI/testing/sysfs-devices-power_resources_D1

0d4a42f6bd298e826620585e766a154ab460617a - Merge tag 'v3.9-rc3' into drm-intel-next-queued

Tue, 19 Mar 2013 09:47:30 +0100

Merge tag 'v3.9-rc3' into drm-intel-next-queuedBackmerge so that I can merge Imre Deak's coalesced sg entries fixes,which depend upon the new for_each_sg_page introduce incommit a321e91b6d73ed011ffceed384c40d2785cf723bAuthor: Imre Deak Date: Wed Feb 27 17:02:56 2013 -0800 lib/scatterlist: add simple page iteratorThe merge itself is just two trivial conflicts:Signed-off-by: Daniel Vetter List of files: /linux/Documentation/ABI/testing/sysfs-devices-power_resources_D1

d608d71cd6d19792487d08333d63c7ff20294694 - Merge tag 'v3.9-rc3' into v4l_for_linus

Tue, 19 Mar 2013 00:58:00 +0100

Merge tag 'v3.9-rc3' into v4l_for_linusLinux 3.9-rc3* tag 'v3.9-rc3': (11231 commits) Linux 3.9-rc3 perf,x86: fix link failure for non-Intel configs perf,x86: fix wrmsr_on_cpu() warning on suspend/resume Btrfs: fix warning of free_extent_map perf,x86: fix kernel crash with PEBS/BTS after suspend/resume ALSA: hda - Fix missing EAPD/GPIO setup for Cirrus codecs sound: sequencer: cap array index in seq_chn_common_event() mfd: twl4030-madc: Remove __exit_p annotation ALSA: hda/ca0132 - Remove extra setting of dsp_state. ALSA: hda/ca0132 - Check download state of DSP. ALSA: hda/ca0132 - Check if dspload_image succeeded. mm/fremap.c: fix possible oops on error path list: Fix double fetch of pointer in hlist_entry_safe() Btrfs: fix warning when creating snapshots Btrfs: return as soon as possible when edquot happens Btrfs: return EIO if we have extent tree corruption btrfs: use rcu_barrier() to wait for bdev puts at unmount Btrfs: remove btrfs_try_spin_lock Btrfs: get better concurrency for snapshot-aware defrag work hwmon: (pmbus/ltc2978) Fix temperature reporting ... List of files: /linux/Documentation/ABI/testing/sysfs-devices-power_resources_D1

aa1262b3876ec5249ff464618a7dcd46b3ca54e2 - Merge branch 'master' into for-next

Mon, 18 Mar 2013 10:57:32 +0100

Merge branch 'master' into for-nextSync with Linus' tree to be able to apply patch to the newlyadded ITG-3200 driver. List of files: /linux/Documentation/ABI/testing/sysfs-devices-power_resources_D1

688d794c4c3f8b08c814381ee2edd3ede5856056 - Merge tag 'v3.9-rc3' into next

Mon, 18 Mar 2013 03:40:50 +0100

Merge tag 'v3.9-rc3' into nextMerge with mainline to bring in module_platform_driver_probe() anddevm_ioremap_resource(). List of files: /linux/Documentation/ABI/testing/sysfs-devices-power_resources_D1

2c4cdf5950b1a7a9d731c03c56e2cea3bd8ca7b7 - Merge tag 'v3.9-rc2' into next

Mon, 11 Mar 2013 02:54:48 +0100

Merge tag 'v3.9-rc2' into nextSync with Linus.Linux 3.9-rc2 List of files: /linux/Documentation/ABI/testing/sysfs-devices-power_resources_D1

ee2c25efdd46d7ed5605d6fe877bdf4b47a4ab2e - Merge branch 'master' into queue

Tue, 05 Mar 2013 00:10:32 +0100

Merge branch 'master' into queue* master: (15791 commits) Linux 3.9-rc1 btrfs/raid56: Add missing #include fix compat_sys_rt_sigprocmask() SUNRPC: One line comment fix ext4: enable quotas before orphan cleanup ext4: don't allow quota mount options when quota feature enabled ext4: fix a warning from sparse check for ext4_dir_llseek ext4: convert number of blocks to clusters properly ext4: fix possible memory leak in ext4_remount() jbd2: fix ERR_PTR dereference in jbd2__journal_start metag: Provide dma_get_sgtable() metag: prom.h: remove declaration of metag_dt_memblock_reserve() metag: copy devicetree to non-init memory metag: cleanup metag_ksyms.c includes metag: move mm/init.c exports out of metag_ksyms.c metag: move usercopy.c exports out of metag_ksyms.c metag: move setup.c exports out of metag_ksyms.c metag: move kick.c exports out of metag_ksyms.c metag: move traps.c exports out of metag_ksyms.c metag: move irq enable out of irqflags.h on SMP ...Signed-off-by: Marcelo Tosatti Conflicts: arch/x86/kernel/kvmclock.c List of files: /linux/Documentation/ABI/testing/sysfs-devices-power_resources_D1

d34c353cd40ff0e6e5ed3753e80f6aa7eaa2c298 - Merge tag 'v3.9-rc1' into staging/for_v3.9

Mon, 04 Mar 2013 15:07:08 +0100

Merge tag 'v3.9-rc1' into staging/for_v3.9Linux 3.9-rc1* tag 'v3.9-rc1': (10698 commits) Linux 3.9-rc1 btrfs/raid56: Add missing #include fix compat_sys_rt_sigprocmask() SUNRPC: One line comment fix ext4: enable quotas before orphan cleanup ext4: don't allow quota mount options when quota feature enabled ext4: fix a warning from sparse check for ext4_dir_llseek ext4: convert number of blocks to clusters properly ext4: fix possible memory leak in ext4_remount() jbd2: fix ERR_PTR dereference in jbd2__journal_start metag: Provide dma_get_sgtable() metag: prom.h: remove declaration of metag_dt_memblock_reserve() metag: copy devicetree to non-init memory metag: cleanup metag_ksyms.c includes metag: move mm/init.c exports out of metag_ksyms.c metag: move usercopy.c exports out of metag_ksyms.c metag: move setup.c exports out of metag_ksyms.c metag: move kick.c exports out of metag_ksyms.c metag: move traps.c exports out of metag_ksyms.c metag: move irq enable out of irqflags.h on SMP ... List of files: /linux/Documentation/ABI/testing/sysfs-devices-power_resources_D1

edb15d83a875a1f4b1576188844db5c330c3267d - Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into mips-for-linux-next

Thu, 21 Feb 2013 16:16:55 +0100

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into mips-for-linux-nextConflicts: include/linux/ssb/ssb_driver_gige.hAlso resolves a logical merge conflict in drivers/net/ethernet/broadcom/-bgmac.c due to change of an API. List of files: /linux/Documentation/ABI/testing/sysfs-devices-power_resources_D1

8793422fd9ac5037f5047f80473007301df3689f - Merge tag 'pm+acpi-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

Wed, 20 Feb 2013 20:26:56 +0100

Merge tag 'pm+acpi-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pmPull ACPI and power management updates from Rafael Wysocki: - Rework of the ACPI namespace scanning code from Rafael J. Wysocki with contributions from Bjorn Helgaas, Jiang Liu, Mika Westerberg, Toshi Kani, and Yinghai Lu. - ACPI power resources handling and ACPI device PM update from Rafael J Wysocki. - ACPICA update to version 20130117 from Bob Moore and Lv Zheng with contributions from Aaron Lu, Chao Guan, Jesper Juhl, and Tim Gardner. - Support for Intel Lynxpoint LPSS from Mika Westerberg. - cpuidle update from Len Brown including Intel Haswell support, C1 state for intel_idle, removal of global pm_idle. - cpuidle fixes and cleanups from Daniel Lezcano. - cpufreq fixes and cleanups from Viresh Kumar and Fabio Baltieri with contributions from Stratos Karafotis and Rickard Andersson. - Intel P-states driver for Sandy Bridge processors from Dirk Brandewie. - cpufreq driver for Marvell Kirkwood SoCs from Andrew Lunn. - cpufreq fixes related to ordering issues between acpi-cpufreq and powernow-k8 from Borislav Petkov and Matthew Garrett. - cpufreq support for Calxeda Highbank processors from Mark Langsdorf and Rob Herring. - cpufreq driver for the Freescale i.MX6Q SoC and cpufreq-cpu0 update from Shawn Guo. - cpufreq Exynos fixes and cleanups from Jonghwan Choi, Sachin Kamat, and Inderpal Singh. - Support for "lightweight suspend" from Zhang Rui. - Removal of the deprecated power trace API from Paul Gortmaker. - Assorted updates from Andreas Fleig, Colin Ian King, Davidlohr Bueso, Joseph Salisbury, Kees Cook, Li Fei, Nishanth Menon, ShuoX Liu, Srinivas Pandruvada, Tejun Heo, Thomas Renninger, and Yasuaki Ishimatsu.* tag 'pm+acpi-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (267 commits) PM idle: remove global declaration of pm_idle unicore32 idle: delete stray pm_idle comment openrisc idle: delete pm_idle mn10300 idle: delete pm_idle microblaze idle: delete pm_idle m32r idle: delete pm_idle, and other dead idle code ia64 idle: delete pm_idle cris idle: delete idle and pm_idle ARM64 idle: delete pm_idle ARM idle: delete pm_idle blackfin idle: delete pm_idle sparc idle: rename pm_idle to sparc_idle sh idle: rename global pm_idle to static sh_idle x86 idle: rename global pm_idle to static x86_idle APM idle: register apm_cpu_idle via cpuidle cpufreq / intel_pstate: Add kernel command line option disable intel_pstate. cpufreq / intel_pstate: Change to disallow module build tools/power turbostat: display SMI count by default intel_idle: export both C1 and C1E ACPI / hotplug: Fix concurrency issues and memory leaks ... List of files: /linux/Documentation/ABI/testing/sysfs-devices-power_resources_D1

a9834cb205bf0d2b52da7f603f43b62a09f503b7 - Merge branch 'acpi-pm'

Mon, 11 Feb 2013 13:20:56 +0100

Merge branch 'acpi-pm'* acpi-pm: (35 commits) ACPI / PM: Handle missing _PSC in acpi_bus_update_power() ACPI / PM: Do not power manage devices in unknown initial states ACPI / PM: Fix acpi_bus_get_device() check in drivers/acpi/device_pm.c ACPI / PM: Fix /proc/acpi/wakeup for devices w/o bus or parent ACPI / PM: Fix consistency check for power resources during resume ACPI / PM: Expose lists of device power resources to user space sysfs: Functions for adding/removing symlinks to/from attribute groups ACPI / PM: Expose current status of ACPI power resources ACPI / PM: Expose power states of ACPI devices to user space ACPI / scan: Prevent device add uevents from racing with user space ACPI / PM: Fix device power state value after transitions to D3cold ACPI / PM: Use string "D3cold" to represent ACPI_STATE_D3_COLD ACPI / PM: Sanitize checks in acpi_power_on_resources() ACPI / PM: Always evaluate _PSn after setting power resources ACPI / PM: Introduce helper for executing _PSn methods ACPI / PM: Make acpi_bus_init_power() more robust ACPI / PM: Fix build for unusual combination of Kconfig options ACPI / PM: remove leading whitespace from #ifdef ACPI / PM: Consolidate suspend-specific and hibernate-specific code ACPI / PM: Move device power management functions to device_pm.c ... List of files: /linux/Documentation/ABI/testing/sysfs-devices-power_resources_D1

8a78cf70fae587b0691b4b982bc69c1261e05e76 - Merge branch 'acpi-pm' into acpi-cleanup

Tue, 29 Jan 2013 13:56:05 +0100

Merge branch 'acpi-pm' into acpi-cleanupThe following commits depend on the 'acpi-pm' material. List of files: /linux/Documentation/ABI/testing/sysfs-devices-power_resources_D1

18a387099b3e3fd901cc706f708b163aa45347b6 - ACPI / PM: Expose lists of device power resources to user space

Fri, 25 Jan 2013 21:51:32 +0100

ACPI / PM: Expose lists of device power resources to user spaceSince ACPI power resources are going to be used more extensively onnew hardware platforms, it is necessary to allow user space (powertopin particular) to look at the lists of power resources correspondingto different power states of devices for diagnostics and controlpurposes.For this reason, for each power state of an ACPI device node usingpower resources create a special attribute group under the devicenode's directory in sysfs containing links to sysfs directoriesrepresenting the power resources in that list. The names of thenew attribute groups are "power_resources_", where is the state name i.e. "D0", "D1", "D2", or "D3hot".Signed-off-by: Rafael J. Wysocki Acked-by: Greg Kroah-Hartman List of files: /linux/Documentation/ABI/testing/sysfs-devices-power_resources_D1