Changes in README

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/tools/thermal/tmon/README

b7d3622a39fde7658170b7f3cf6c6889bb8db30d - Merge tag 'v3.13' into for-3.15

Fri, 07 Mar 2014 17:41:32 +0100

Merge tag 'v3.13' into for-3.15Linux 3.13Conflicts: include/net/xfrm.hSimple merge where v3.13 removed 'extern' from definitions and the audittree did s/u32/unsigned int/ to the same definitions. List of files: /linux/tools/thermal/tmon/README

41be702a542a0d14bb0b1c16e824fa9ed27616ec - Merge tag 'v3.13' into next

Thu, 23 Jan 2014 21:52:06 +0100

Merge tag 'v3.13' into nextLinux 3.13Minor fixup needed in selinux_inet_conn_request()Conflicts: security/selinux/hooks.c List of files: /linux/tools/thermal/tmon/README

825e587af2e90e9b953849f3347a01d8f383d577 - Merge tag 'v3.13' into stable-3.14

Tue, 28 Jan 2014 20:44:16 +0100

Merge tag 'v3.13' into stable-3.14Linux 3.13Conflicts: security/selinux/hooks.cTrivial merge issue in selinux_inet_conn_request() likely due to meincluding patches that I sent to the stable folks in my next treeresulting in the patch hitting twice (I think). Thankfully it was aneasy fix this time, but regardless, lesson learned, I will not do thatagain. List of files: /linux/tools/thermal/tmon/README

38fd2c202a3d82bc12430bce5789fa2c2a406f71 - Merge to v3.13-rc7 for prerequisite changes in the Xen code for TPM

Mon, 06 Jan 2014 12:23:01 +0100

Merge to v3.13-rc7 for prerequisite changes in the Xen code for TPM List of files: /linux/tools/thermal/tmon/README

37e2c2a775fc887acd1432908478dfd532f7f00f - Merge commit v3.13-rc1 into kbuild/misc

Thu, 02 Jan 2014 14:02:06 +0100

Merge commit v3.13-rc1 into kbuild/misc List of files: /linux/tools/thermal/tmon/README

e23c34bb41da65f354fb7eee04300c56ee48f60c - Merge branch 'master' into for-next

Thu, 19 Dec 2013 15:08:03 +0100

Merge branch 'master' into for-nextSync with Linus' tree to be able to apply fixes on top of newer thingsin tree (efi-stub).Signed-off-by: Jiri Kosina List of files: /linux/tools/thermal/tmon/README

c4de673b775e4db48cd2db6277e0c6714332ca0c - Merge remote-tracking branch 'wireless-next/master' into mac80211-next

Mon, 16 Dec 2013 11:23:45 +0100

Merge remote-tracking branch 'wireless-next/master' into mac80211-next List of files: /linux/tools/thermal/tmon/README

348324c5b10bcba8d9daabdfb85a6927311be34f - Merge tag 'v3.13-rc4' into next

Mon, 16 Dec 2013 11:04:49 +0100

Merge tag 'v3.13-rc4' into nextSynchronize with mainline to bring in the new keycode definitions andnew hwmon API. List of files: /linux/tools/thermal/tmon/README

5d43889c07bb38694742936aa70d1187c012e198 - Merge tag 'v3.13-rc3' into for-linus

Tue, 10 Dec 2013 07:22:40 +0100

Merge tag 'v3.13-rc3' into for-linusMerging with the mainline to sync up on changes to serio core. List of files: /linux/tools/thermal/tmon/README

f7698ba75fa283435f5077b9dfb4319d28b9de9a - Merge tag 'v3.13-rc3' into drm-intel-next-queued

Mon, 09 Dec 2013 09:17:02 +0100

Merge tag 'v3.13-rc3' into drm-intel-next-queuedLinux 3.13-rc3I need a backmerge for two reasons:- For merging the ppgtt patches from Ben I need to pull in the bdw support.- We now have duplicated calls to intel_uncore_forcewake_reset in the setup code to due 2 different patches merged into -next and 3.13. The conflict is silen so I need the merge to be able to apply Deepak's fixup patch.Conflicts: drivers/gpu/drm/i915/intel_display.cTrivial conflict, it doesn't even show up in the merge diff.Signed-off-by: Daniel Vetter List of files: /linux/tools/thermal/tmon/README

f19f8d8ebc0b392c01082e0feb44ec152cc47a30 - Merge branch 'omap-for-v3.13/fixes-take4' into omap-for-v3.14/board-removal

Tue, 26 Nov 2013 00:30:10 +0100

Merge branch 'omap-for-v3.13/fixes-take4' into omap-for-v3.14/board-removal List of files: /linux/tools/thermal/tmon/README

6310f3a9362e8fa2e29c8f84aa603b5f86e98442 - Merge branch 'dt-regressions' into omap-for-v3.13/fixes-take4

Mon, 25 Nov 2013 23:47:27 +0100

Merge branch 'dt-regressions' into omap-for-v3.13/fixes-take4 List of files: /linux/tools/thermal/tmon/README

258d2fbf874c87830664cb7ef41f9741c1abffac - Merge tag 'v3.13-rc1' into patchwork

Mon, 25 Nov 2013 08:57:23 +0100

Merge tag 'v3.13-rc1' into patchworkLinux 3.13-rc1* tag 'v3.13-rc1': (11465 commits) Linux 3.13-rc1 ALSA: hda - Set current_headset_type to ALC_HEADSET_TYPE_ENUM (janitorial) ALSA: hda - Provide missing pin configs for VAIO with ALC260 mm: place page->pmd_huge_pte to right union MAINTAINERS: add keyboard driver to Hyper-V file list x86, mm: do not leak page->ptl for pmd page tables ipc,shm: correct error return value in shmctl (SHM_UNLOCK) mm, mempolicy: silence gcc warning block/partitions/efi.c: fix bound check ARM: drivers/rtc/rtc-at91rm9200.c: disable interrupts at shutdown mm: hugetlbfs: fix hugetlbfs optimization kernel: remove CONFIG_USE_GENERIC_SMP_HELPERS cleanly ipc,shm: fix shm_file deletion races mm: thp: give transparent hugepage code a separate copy_page checkpatch: fix "Use of uninitialized value" warnings configfs: fix race between dentry put and lookup gso: handle new frag_list of frags GRO packets GFS2: Fix ref count bug relating to atomic_open genetlink: fix genl_set_err() group ID genetlink: fix genlmsg_multicast() bug ... List of files: /linux/tools/thermal/tmon/README

30c27abd28fa168d7ebd2e5286f1fe473c74bfa9 - Merge tag 'v3.13-rc1' into asoc-arizona

Sun, 24 Nov 2013 15:35:18 +0100

Merge tag 'v3.13-rc1' into asoc-arizonaLinux 3.13-rc1 List of files: /linux/tools/thermal/tmon/README

555a098af6086256bc64d3806519f37ccae936e0 - Merge branch 'linus' into perf/urgent

Thu, 14 Nov 2013 08:28:30 +0100

Merge branch 'linus' into perf/urgentMerge dependencies to apply a fix.Signed-off-by: Ingo Molnar List of files: /linux/tools/thermal/tmon/README

549608eadb31eac5d579ed70a21ac722bdf72861 - Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux

Thu, 14 Nov 2013 06:42:31 +0100

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linuxPull thermal management updates from Zhang Rui: "This time we only have a few changes as there are no soc thermal changes from Eduardo. The only big change is the introduction of TMON, a tool to help visualize, tune, and test the thermal subsystem. The rest is mostly cleanups and fixes all over. Specifics: - introduce TMON, a tool base on thermal sysfs I/F. It can be used to visualize, tune and test the thermal subsystem. - fix a zone/cooling device binding problem, when both thermal zone bind parameters and .bind() callback are available"* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux: tools/thermal: Introduce tmon, a tool for thermal subsystem thermal: Fix binding problem when there is thermal zone params thermal: cpu_cooling: fix return value check in cpufreq_cooling_register() Thermal: Check for validity before doing kfree thermal/intel_powerclamp: Add newer CPU models Thermal: Tidy up error handling in powerclamp_init thermal: Kconfig: cosmetic fixes ACPI/thermal : Remove zone disabled warning typo in drivers/thermal/Kconfig: lpatform instead of platform List of files: /linux/tools/thermal/tmon/README

86e0a0bdf81c2dfa2a5a258dbb52f49c40ebc197 - Merge branches 'intel_powerclamp', 'tmon' and 'misc' of .git into next

Thu, 07 Nov 2013 01:45:54 +0100

Merge branches 'intel_powerclamp', 'tmon' and 'misc' of .git into next List of files: /linux/tools/thermal/tmon/README

94f69966faf8e70bd655ea25f9dd5b9400567b75 - tools/thermal: Introduce tmon, a tool for thermal subsystem

Tue, 15 Oct 2013 01:02:27 +0200

tools/thermal: Introduce tmon, a tool for thermal subsystemIncreasingly, Linux is running on thermally constrained devices. The simplethermal relationship between processor and fan has become past for moderncomputers.As hardware vendors cope with the thermal constraints on their products,more sensors are added, new cooling capabilities are introduced. Thecomplexity of the thermal relationship can grow exponentially among coolingdevices, zones, sensors, and trip points. They can also change dynamically.To expose such relationship to the userspace, Linux generic thermal layerintroduced sysfs entry at /sys/class/thermal with a matrix of symboliclinks, trip point bindings, and device instances. To traverse suchmatrix by hand is not a trivial task. Testing is also difficult in thatthermal conditions are often exception cases that hard to reach innormal operations.TMON is conceived as a tool to help visualize, tune, and test thecomplex thermal subsystem.Signed-off-by: Jacob Pan Signed-off-by: Zhang Rui List of files: /linux/tools/thermal/tmon/README