Skip to content
This repository has been archived by the owner on Aug 5, 2022. It is now read-only.

MFD_HSU: Fix bad trace include #3

Open
wants to merge 1 commit into
base: edison-3.10.17
Choose a base branch
from

Conversation

jpilet
Copy link

@jpilet jpilet commented Dec 28, 2015

Fixes the indirect inclusion of mfd_trace.h by mfd_core.c.

Fixes the indirect inclusion of mfd_trace.h by mfd_core.c.
ipuustin pushed a commit to ipuustin/edison-linux that referenced this pull request Feb 17, 2016
Port K3.4 thermal code for cloverview platform to K3.10

Following changes are ported:
a9f8652 EM/THERMAL: Sysfs to read,override values mapped to states
fcf62aa EM/THERMAL: Add platform thermal driver for BYT-M
bd54515 BYT-M: add key buttons support based on non-ACPI ec driver
d42d794 psh: Remove the driver source file
456475d OSNIB: Moved OSNIB driver to external driver folder
a2fef50 OSIP: Moved osip driver to external_driver folder
a5a6fcb EM/THERMAL: Reverting msic die slope/intercept.
872aaa2 Revert "psh: Remove the driver source file"
a984b4a psh: Remove the driver source file
3211da2 intel_msic_gpio: Remove the driver source file
1796947 EM/THERMAL: Add new ear and mic zones for VB
b00a44e EM/THERMAL: Add SoC cooling device
1f3f0c1 BYT-M/EC: add EC driver(non ACPI) support for BYT-M
ee39e96 Modem NVRAM driver
4e89c4a EM/THERMAL: Modify slope and inercept for thermal sensors
f9ae71f EM/THERMAL: Predicting skin temperature accurately.
3edf760 crystal_cove: provide similar interfaces with earlier platforms
772f9f4 Merge remote-tracking branch 'aosp/android-3.4' into HEAD
be601e9 EM/THERMAL: Add Platform Thermal driver for BYT
ff8f9c9 x86: intel-mid: remove compilation warnings from CTP's
device_libs files
b9f3bf1 thermal: shorten too long mcast group name
61fd027 Change kernel intel_scu_ipc_command calls to rpmsg calls
b069aa4 EM/THERMAL: Negative temperature handling in thermal.
fa0e689 msic_gpio: add intel msic gpio support for CLV
1586ea0 EM/THERMAL: Changing msic die temp equation.
37fca05 OSNIB: add support for BYT using CMOS
99dcbb7 crystalcove_pwrsrc: Enable Power source detection driver
b0ee84f0 pmic_charger: handle the USBDET interrupt on CTP for USB
connect/disconnect
0e5ba36 platform/x86: fix section mismatches
fcc4149 EM/THERMAL[Port from k3.0]: Klockwork fix in thermal_sys.c
2298248 flis: port FLIS driver to K3.4
ce0a9d5 intel_psh_ipc: add PSH IPC support for
Merrifield Platform
dbfbda7 EM/THERMAL[Port from K3.0]: Add SoC Thermal driver
3cf105b EM/THERMAL[Port from K3.0]: Thermal driver for MRFLD
4642d8c EM/THERMAL[Port from K3.0]: Add get-set methods for slope
interface
83a7507 EM/THERMAL[Port from K3.0]: Add slope/intercept sysfs interfaces
892f28b EM/THERMAL: Update Thermal driver's init call
2fc592f Updating Thermal driver for battery/charger
changes
0237d0b OSIP: UMIP: Add OSIP and UMIP driver for Intel SoC
02efffb scu_ipc: Adding IPC,PMIC,MIP,FW,IPCUTIL driver
75734aa remoteproc: intel_mid_remoteproc framework (WIP)
9c7b942 INTEL-MID: re-structure arch/x86/platform/mrst
a335750 Merge branch 'release' of
git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
61e5191 Merge branch 'for_linus' of
git://cavan.codon.org.uk/platform-drivers-x86
917ee75 platform/x86: Add driver for Apple gmux device
2390481 Merge branch 'x86-platform-for-linus' of
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
f11f999 toshiba_acpi: Refuse to load on machines with buggy INFO
implementations
6a92c36 thermal: add support for thermal sensor present on SPEAr13xx
machines
f39eaa6 platform, x86: Kill off Moorestown
0266e49 platform-x86: intel_mid_thermal: turn off thermistor voltage by
default
420138a platform-x86: intel_mid_thermal: convert to use Intel MSIC API
3fca3d3 platform-x86: intel_mid_thermal: add msic_thermal alias
7ec48ce platform/x86: drop deprecated asus_acpi driver
73d99a2 platform-drivers-x86: convert drivers/platform/x86/* to use
module_platform_driver()
2d24c49 Fujitsu tablet extras driver
c215ab9 x86: Add amilo-rfkill driver for some Fujitsu-Siemens Amilo
laptops
1b7ccab x86/mid/thermal: Turn off thermistor
6348307 x86/mid/thermal: Add msic_thermal alias
0f48d34 x86/mid/thermal: Convert to use Intel MSIC API
33e9970 x86/mid: Kill off Moorestown
2d58d7e thermal: Rename generate_netlink_event
78542e1 Platform: Samsung Q10 backlight driver
03f8952 platform-drivers-x86: intel_mid_thermal: fix memory leak
31f5396 thermal: make THERMAL_HWMON implementation fully internal
239dca9 platform-x86: intel_mid_thermal: Fix memory leak
cb8b646 platform/x86: Fix Makefile for intel_mid_powerbtn
bb3ce20 platform/oaktrail: ACPI EC Extra driver for Oaktrail
253a006 platform-x86: intel_mid_thermal: Fix coding style
99b38b4 platform/x86: add MXM WMI driver.
25985ed Fix common misspellings
2d70b73 Platform: add Samsung Laptop platform driver
47ae435 platform-driver-x86: intel_mid_thermal: fix unterminated
platform_device_id table
b229ece asus-nb-wmi: Asus Notebooks WMI Driver
e12e6d9 eeepc-wmi: asus generic asus-wmi.ko module
5b799d4 asus-wmi: move generic code to asus-wmi
f017fbe medfield: Add Thermal Driver
820787f Enable Dell All-In-One volume up/down keys
8eec8a1 intel_mid_powerbtn: add power button driver for Medfield
platform (intel#3)
89ca117 OLPC XO-1.5 ebook switch driver
efcfed9 Move hp_accel to drivers/platform/x86
af06216 ACPI: Fix build for CONFIG_NET unset
52cfd50 Merge branch 'release' of
git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
156d821 Merge branch 'misc' into release
4cb1872 thermal: Add event notification to thermal framework
5369c02 intel_scu_ipc: Utility driver for intel scu ipc
5b275ce thermal: make ops constant
35f0ce0 IBM Real-Time "SMI Free" mode driver -v7
260586d Add OLPC XO-1 rfkill driver
bd9fc3a Move hdaps driver to platform/x86
75b2d09 ideapad-laptop: Fix Makefile
57ac3b0 ideapad: Change the driver name to ideapad-laptop
58ac7aa Add Lenovo ideapad driver
8950778 gpio: Add PMIC GPIO block support
c715a38 rar: Move the RAR driver into the right place as its now clean
aa7ffc0 x86 platform driver: intelligent power sharing driver
9a58a33 IPC driver for Intel Mobile Internet Device (MID) platforms
ee027e4 eeepc-wmi: new driver for WMI based hotkeys on Eee PC laptops
529aa8c classmate-laptop: add support for Classmate PC ACPI devices
243e1ef Merge branch 'toshiba-bt' into release
d12d8ba X86 drivers: Introduce msi-wmi driver
42b4e9e Toshiba Bluetooth Enabling driver (RFKill handler v3)
9caeb53 topstar-laptop: add new driver for hotkeys support on Topstar
N01
e86435e acerhdf: Acer Aspire One fan control
2e33b23 Merge branch 'dell-wmi' into release
0b3f610 dell-wmi: new driver for hotkey control
03a971a thermal: support forcing support for passive cooling
b1569e9 ACPI: move thermal trip handling to generic thermal layer
6503e5d thermal: use integers rather than strings for thermal values
cad7312 dell-laptop: move to drivers/platform/x86/ from drivers/misc/
b4f9fe1 ACPI: move wmi, asus_acpi, toshiba_acpi to drivers/platform/x86
41b16dc create drivers/platform/x86/ from drivers/misc/
16d7523 thermal: Create CONFIG_THERMAL_HWMON=n
ff16cab thermal: re-name thermal.c to thermal_sys.c
e68b16a thermal: add hwmon sysfs I/F
9ec732f thermal: add new get_crit_temp callback
63c4ec9 thermal: add the support for building the generic thermal as a
module
5f1a3f2 acpi thermal trip points increased to 12
a0dd25b ACPI: thermal: buildfix for CONFIG_THERMAL=n
041d4bb ACPI: CELSIUS_TO_KELVIN fixup
203d3d4 the generic thermal sysfs driver

Signed-off-by: Sumeet Pawnikar <sumeet.r.pawnikar@intel.com>
funman pushed a commit to SipRadius/edison-linux that referenced this pull request Mar 10, 2016
commit ecf5fc6 upstream.

Nikolay has reported a hang when a memcg reclaim got stuck with the
following backtrace:

PID: 18308  TASK: ffff883d7c9b0a30  CPU: 1   COMMAND: "rsync"
  #0 __schedule at ffffffff815ab152
  #1 schedule at ffffffff815ab76e
  intel#2 schedule_timeout at ffffffff815ae5e5
  intel#3 io_schedule_timeout at ffffffff815aad6a
  intel#4 bit_wait_io at ffffffff815abfc6
  intel#5 __wait_on_bit at ffffffff815abda5
  intel#6 wait_on_page_bit at ffffffff8111fd4f
  intel#7 shrink_page_list at ffffffff81135445
  intel#8 shrink_inactive_list at ffffffff81135845
  intel#9 shrink_lruvec at ffffffff81135ead
 intel#10 shrink_zone at ffffffff811360c3
 intel#11 shrink_zones at ffffffff81136eff
 intel#12 do_try_to_free_pages at ffffffff8113712f
 intel#13 try_to_free_mem_cgroup_pages at ffffffff811372be
 intel#14 try_charge at ffffffff81189423
 intel#15 mem_cgroup_try_charge at ffffffff8118c6f5
 intel#16 __add_to_page_cache_locked at ffffffff8112137d
 intel#17 add_to_page_cache_lru at ffffffff81121618
 intel#18 pagecache_get_page at ffffffff8112170b
 intel#19 grow_dev_page at ffffffff811c8297
 intel#20 __getblk_slow at ffffffff811c91d6
 intel#21 __getblk_gfp at ffffffff811c92c1
 intel#22 ext4_ext_grow_indepth at ffffffff8124565c
 intel#23 ext4_ext_create_new_leaf at ffffffff81246ca8
 intel#24 ext4_ext_insert_extent at ffffffff81246f09
 intel#25 ext4_ext_map_blocks at ffffffff8124a848
 intel#26 ext4_map_blocks at ffffffff8121a5b7
 #27 mpage_map_one_extent at ffffffff8121b1fa
 #28 mpage_map_and_submit_extent at ffffffff8121f07b
 #29 ext4_writepages at ffffffff8121f6d5
 #30 do_writepages at ffffffff8112c490
 #31 __filemap_fdatawrite_range at ffffffff81120199
 #32 filemap_flush at ffffffff8112041c
 #33 ext4_alloc_da_blocks at ffffffff81219da1
 #34 ext4_rename at ffffffff81229b91
 #35 ext4_rename2 at ffffffff81229e32
 #36 vfs_rename at ffffffff811a08a5
 #37 SYSC_renameat2 at ffffffff811a3ffc
 #38 sys_renameat2 at ffffffff811a408e
 #39 sys_rename at ffffffff8119e51e
 #40 system_call_fastpath at ffffffff815afa89

Dave Chinner has properly pointed out that this is a deadlock in the
reclaim code because ext4 doesn't submit pages which are marked by
PG_writeback right away.

The heuristic was introduced by commit e62e384 ("memcg: prevent OOM
with too many dirty pages") and it was applied only when may_enter_fs
was specified.  The code has been changed by c3b94f4 ("memcg:
further prevent OOM with too many dirty pages") which has removed the
__GFP_FS restriction with a reasoning that we do not get into the fs
code.  But this is not sufficient apparently because the fs doesn't
necessarily submit pages marked PG_writeback for IO right away.

ext4_bio_write_page calls io_submit_add_bh but that doesn't necessarily
submit the bio.  Instead it tries to map more pages into the bio and
mpage_map_one_extent might trigger memcg charge which might end up
waiting on a page which is marked PG_writeback but hasn't been submitted
yet so we would end up waiting for something that never finishes.

Fix this issue by replacing __GFP_IO by may_enter_fs check (for case 2)
before we go to wait on the writeback.  The page fault path, which is
the only path that triggers memcg oom killer since 3.12, shouldn't
require GFP_NOFS and so we shouldn't reintroduce the premature OOM
killer issue which was originally addressed by the heuristic.

As per David Chinner the xfs is doing similar thing since 2.6.15 already
so ext4 is not the only affected filesystem.  Moreover he notes:

: For example: IO completion might require unwritten extent conversion
: which executes filesystem transactions and GFP_NOFS allocations. The
: writeback flag on the pages can not be cleared until unwritten
: extent conversion completes. Hence memory reclaim cannot wait on
: page writeback to complete in GFP_NOFS context because it is not
: safe to do so, memcg reclaim or otherwise.

[tytso@mit.edu: corrected the control flow]
Fixes: c3b94f4 ("memcg: further prevent OOM with too many dirty pages")
Reported-by: Nikolay Borisov <kernel@kyup.com>
Signed-off-by: Michal Hocko <mhocko@suse.cz>
Signed-off-by: Hugh Dickins <hughd@google.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
funman pushed a commit to SipRadius/edison-linux that referenced this pull request Mar 10, 2016
commit 361cad3 upstream.

We've seen this in a packet capture - I've intermixed what I
think was going on. The fix here is to grab the so_lock sooner.

1964379 -> #1 open (for write) reply seqid=1
1964393 -> intel#2 open (for read) reply seqid=2

  __nfs4_close(), state->n_wronly--
  nfs4_state_set_mode_locked(), changes state->state = [R]
  state->flags is [RW]
  state->state is [R], state->n_wronly == 0, state->n_rdonly == 1

1964398 -> intel#3 open (for write) call -> because close is already running
1964399 -> downgrade (to read) call seqid=2 (close of #1)
1964402 -> intel#3 open (for write) reply seqid=3

 __update_open_stateid()
   nfs_set_open_stateid_locked(), changes state->flags
   state->flags is [RW]
   state->state is [R], state->n_wronly == 0, state->n_rdonly == 1
   new sequence number is exposed now via nfs4_stateid_copy()

   next step would be update_open_stateflags(), pending so_lock

1964403 -> downgrade reply seqid=2, fails with OLD_STATEID (close of #1)

   nfs4_close_prepare() gets so_lock and recalcs flags -> send close

1964405 -> downgrade (to read) call seqid=3 (close of #1 retry)

   __update_open_stateid() gets so_lock
 * update_open_stateflags() updates state->n_wronly.
   nfs4_state_set_mode_locked() updates state->state

   state->flags is [RW]
   state->state is [RW], state->n_wronly == 1, state->n_rdonly == 1

 * should have suppressed the preceding nfs4_close_prepare() from
   sending open_downgrade

1964406 -> write call
1964408 -> downgrade (to read) reply seqid=4 (close of #1 retry)

   nfs_clear_open_stateid_locked()
   state->flags is [R]
   state->state is [RW], state->n_wronly == 1, state->n_rdonly == 1

1964409 -> write reply (fails, openmode)

Signed-off-by: Andrew Elble <aweits@rit.edu>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
funman pushed a commit to SipRadius/edison-linux that referenced this pull request Mar 10, 2016
commit 09dc9cd upstream.

The code produces the following trace:

[1750924.419007] general protection fault: 0000 [intel#3] SMP
[1750924.420364] Modules linked in: nfnetlink autofs4 rpcsec_gss_krb5 nfsv4
dcdbas rfcomm bnep bluetooth nfsd auth_rpcgss nfs_acl dm_multipath nfs lockd
scsi_dh sunrpc fscache radeon ttm drm_kms_helper drm serio_raw parport_pc
ppdev i2c_algo_bit lpc_ich ipmi_si ib_mthca ib_qib dca lp parport ib_ipoib
mac_hid ib_cm i3000_edac ib_sa ib_uverbs edac_core ib_umad ib_mad ib_core
ib_addr tg3 ptp dm_mirror dm_region_hash dm_log psmouse pps_core
[1750924.420364] CPU: 1 PID: 8401 Comm: python Tainted: G D
3.13.0-39-generic #66-Ubuntu
[1750924.420364] Hardware name: Dell Computer Corporation PowerEdge
860/0XM089, BIOS A04 07/24/2007
[1750924.420364] task: ffff8800366a9800 ti: ffff88007af1c000 task.ti:
ffff88007af1c000
[1750924.420364] RIP: 0010:[<ffffffffa0131d51>] [<ffffffffa0131d51>]
qib_mcast_qp_free+0x11/0x50 [ib_qib]
[1750924.420364] RSP: 0018:ffff88007af1dd70  EFLAGS: 00010246
[1750924.420364] RAX: 0000000000000001 RBX: ffff88007b822688 RCX:
000000000000000f
[1750924.420364] RDX: ffff88007b822688 RSI: ffff8800366c15a0 RDI:
6764697200000000
[1750924.420364] RBP: ffff88007af1dd78 R08: 0000000000000001 R09:
0000000000000000
[1750924.420364] R10: 0000000000000011 R11: 0000000000000246 R12:
ffff88007baa1d98
[1750924.420364] R13: ffff88003ecab000 R14: ffff88007b822660 R15:
0000000000000000
[1750924.420364] FS:  00007ffff7fd8740(0000) GS:ffff88007fc80000(0000)
knlGS:0000000000000000
[1750924.420364] CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
[1750924.420364] CR2: 00007ffff597c750 CR3: 000000006860b000 CR4:
00000000000007e0
[1750924.420364] Stack:
[1750924.420364]  ffff88007b822688 ffff88007af1ddf0 ffffffffa0132429
000000007af1de20
[1750924.420364]  ffff88007baa1dc8 ffff88007baa0000 ffff88007af1de70
ffffffffa00cb313
[1750924.420364]  00007fffffffde88 0000000000000000 0000000000000008
ffff88003ecab000
[1750924.420364] Call Trace:
[1750924.420364]  [<ffffffffa0132429>] qib_multicast_detach+0x1e9/0x350
[ib_qib]
[1750924.568035]  [<ffffffffa00cb313>] ? ib_uverbs_modify_qp+0x323/0x3d0
[ib_uverbs]
[1750924.568035]  [<ffffffffa0092d61>] ib_detach_mcast+0x31/0x50 [ib_core]
[1750924.568035]  [<ffffffffa00cc213>] ib_uverbs_detach_mcast+0x93/0x170
[ib_uverbs]
[1750924.568035]  [<ffffffffa00c61f6>] ib_uverbs_write+0xc6/0x2c0 [ib_uverbs]
[1750924.568035]  [<ffffffff81312e68>] ? apparmor_file_permission+0x18/0x20
[1750924.568035]  [<ffffffff812d4cd3>] ? security_file_permission+0x23/0xa0
[1750924.568035]  [<ffffffff811bd214>] vfs_write+0xb4/0x1f0
[1750924.568035]  [<ffffffff811bdc49>] SyS_write+0x49/0xa0
[1750924.568035]  [<ffffffff8172f7ed>] system_call_fastpath+0x1a/0x1f
[1750924.568035] Code: 66 2e 0f 1f 84 00 00 00 00 00 31 c0 5d c3 66 2e 0f 1f
84 00 00 00 00 00 66 90 0f 1f 44 00 00 55 48 89 e5 53 48 89 fb 48 8b 7f 10
<f0> ff 8f 40 01 00 00 74 0e 48 89 df e8 8e f8 06 e1 5b 5d c3 0f
[1750924.568035] RIP  [<ffffffffa0131d51>] qib_mcast_qp_free+0x11/0x50
[ib_qib]
[1750924.568035]  RSP <ffff88007af1dd70>
[1750924.650439] ---[ end trace 73d5d4b3f8ad4851 ]

The fix is to note the qib_mcast_qp that was found.   If none is found, then
return EINVAL indicating the error.

Reviewed-by: Dennis Dalessandro <dennis.dalessandro@intel.com>
Reported-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
Signed-off-by: Mike Marciniszyn <mike.marciniszyn@intel.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
zhenmingx pushed a commit that referenced this pull request Mar 11, 2016
Port K3.4 thermal code for cloverview platform to K3.10

Following changes are ported:
a9f8652 EM/THERMAL: Sysfs to read,override values mapped to states
fcf62aa EM/THERMAL: Add platform thermal driver for BYT-M
bd54515 BYT-M: add key buttons support based on non-ACPI ec driver
d42d794 psh: Remove the driver source file
456475d OSNIB: Moved OSNIB driver to external driver folder
a2fef50 OSIP: Moved osip driver to external_driver folder
a5a6fcb EM/THERMAL: Reverting msic die slope/intercept.
872aaa2 Revert "psh: Remove the driver source file"
a984b4a psh: Remove the driver source file
3211da2 intel_msic_gpio: Remove the driver source file
1796947 EM/THERMAL: Add new ear and mic zones for VB
b00a44e EM/THERMAL: Add SoC cooling device
1f3f0c1 BYT-M/EC: add EC driver(non ACPI) support for BYT-M
ee39e96 Modem NVRAM driver
4e89c4a EM/THERMAL: Modify slope and inercept for thermal sensors
f9ae71f EM/THERMAL: Predicting skin temperature accurately.
3edf760 crystal_cove: provide similar interfaces with earlier platforms
772f9f4 Merge remote-tracking branch 'aosp/android-3.4' into HEAD
be601e9 EM/THERMAL: Add Platform Thermal driver for BYT
ff8f9c9 x86: intel-mid: remove compilation warnings from CTP's
device_libs files
b9f3bf1 thermal: shorten too long mcast group name
61fd027 Change kernel intel_scu_ipc_command calls to rpmsg calls
b069aa4 EM/THERMAL: Negative temperature handling in thermal.
fa0e689 msic_gpio: add intel msic gpio support for CLV
1586ea0 EM/THERMAL: Changing msic die temp equation.
37fca05 OSNIB: add support for BYT using CMOS
99dcbb7 crystalcove_pwrsrc: Enable Power source detection driver
b0ee84f0 pmic_charger: handle the USBDET interrupt on CTP for USB
connect/disconnect
0e5ba36 platform/x86: fix section mismatches
fcc4149 EM/THERMAL[Port from k3.0]: Klockwork fix in thermal_sys.c
2298248 flis: port FLIS driver to K3.4
ce0a9d5 intel_psh_ipc: add PSH IPC support for
Merrifield Platform
dbfbda7 EM/THERMAL[Port from K3.0]: Add SoC Thermal driver
3cf105b EM/THERMAL[Port from K3.0]: Thermal driver for MRFLD
4642d8c EM/THERMAL[Port from K3.0]: Add get-set methods for slope
interface
83a7507 EM/THERMAL[Port from K3.0]: Add slope/intercept sysfs interfaces
892f28b EM/THERMAL: Update Thermal driver's init call
2fc592f Updating Thermal driver for battery/charger
changes
0237d0b OSIP: UMIP: Add OSIP and UMIP driver for Intel SoC
02efffb scu_ipc: Adding IPC,PMIC,MIP,FW,IPCUTIL driver
75734aa remoteproc: intel_mid_remoteproc framework (WIP)
9c7b942 INTEL-MID: re-structure arch/x86/platform/mrst
a335750 Merge branch 'release' of
git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
61e5191 Merge branch 'for_linus' of
git://cavan.codon.org.uk/platform-drivers-x86
917ee75 platform/x86: Add driver for Apple gmux device
2390481 Merge branch 'x86-platform-for-linus' of
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
f11f999 toshiba_acpi: Refuse to load on machines with buggy INFO
implementations
6a92c36 thermal: add support for thermal sensor present on SPEAr13xx
machines
f39eaa6 platform, x86: Kill off Moorestown
0266e49 platform-x86: intel_mid_thermal: turn off thermistor voltage by
default
420138a platform-x86: intel_mid_thermal: convert to use Intel MSIC API
3fca3d3 platform-x86: intel_mid_thermal: add msic_thermal alias
7ec48ce platform/x86: drop deprecated asus_acpi driver
73d99a2 platform-drivers-x86: convert drivers/platform/x86/* to use
module_platform_driver()
2d24c49 Fujitsu tablet extras driver
c215ab9 x86: Add amilo-rfkill driver for some Fujitsu-Siemens Amilo
laptops
1b7ccab x86/mid/thermal: Turn off thermistor
6348307 x86/mid/thermal: Add msic_thermal alias
0f48d34 x86/mid/thermal: Convert to use Intel MSIC API
33e9970 x86/mid: Kill off Moorestown
2d58d7e thermal: Rename generate_netlink_event
78542e1 Platform: Samsung Q10 backlight driver
03f8952 platform-drivers-x86: intel_mid_thermal: fix memory leak
31f5396 thermal: make THERMAL_HWMON implementation fully internal
239dca9 platform-x86: intel_mid_thermal: Fix memory leak
cb8b646 platform/x86: Fix Makefile for intel_mid_powerbtn
bb3ce20 platform/oaktrail: ACPI EC Extra driver for Oaktrail
253a006 platform-x86: intel_mid_thermal: Fix coding style
99b38b4 platform/x86: add MXM WMI driver.
25985ed Fix common misspellings
2d70b73 Platform: add Samsung Laptop platform driver
47ae435 platform-driver-x86: intel_mid_thermal: fix unterminated
platform_device_id table
b229ece asus-nb-wmi: Asus Notebooks WMI Driver
e12e6d9 eeepc-wmi: asus generic asus-wmi.ko module
5b799d4 asus-wmi: move generic code to asus-wmi
f017fbe medfield: Add Thermal Driver
820787f Enable Dell All-In-One volume up/down keys
8eec8a1 intel_mid_powerbtn: add power button driver for Medfield
platform (#3)
89ca117 OLPC XO-1.5 ebook switch driver
efcfed9 Move hp_accel to drivers/platform/x86
af06216 ACPI: Fix build for CONFIG_NET unset
52cfd50 Merge branch 'release' of
git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
156d821 Merge branch 'misc' into release
4cb1872 thermal: Add event notification to thermal framework
5369c02 intel_scu_ipc: Utility driver for intel scu ipc
5b275ce thermal: make ops constant
35f0ce0 IBM Real-Time "SMI Free" mode driver -v7
260586d Add OLPC XO-1 rfkill driver
bd9fc3a Move hdaps driver to platform/x86
75b2d09 ideapad-laptop: Fix Makefile
57ac3b0 ideapad: Change the driver name to ideapad-laptop
58ac7aa Add Lenovo ideapad driver
8950778 gpio: Add PMIC GPIO block support
c715a38 rar: Move the RAR driver into the right place as its now clean
aa7ffc0 x86 platform driver: intelligent power sharing driver
9a58a33 IPC driver for Intel Mobile Internet Device (MID) platforms
ee027e4 eeepc-wmi: new driver for WMI based hotkeys on Eee PC laptops
529aa8c classmate-laptop: add support for Classmate PC ACPI devices
243e1ef Merge branch 'toshiba-bt' into release
d12d8ba X86 drivers: Introduce msi-wmi driver
42b4e9e Toshiba Bluetooth Enabling driver (RFKill handler v3)
9caeb53 topstar-laptop: add new driver for hotkeys support on Topstar
N01
e86435e acerhdf: Acer Aspire One fan control
2e33b23 Merge branch 'dell-wmi' into release
0b3f610 dell-wmi: new driver for hotkey control
03a971a thermal: support forcing support for passive cooling
b1569e9 ACPI: move thermal trip handling to generic thermal layer
6503e5d thermal: use integers rather than strings for thermal values
cad7312 dell-laptop: move to drivers/platform/x86/ from drivers/misc/
b4f9fe1 ACPI: move wmi, asus_acpi, toshiba_acpi to drivers/platform/x86
41b16dc create drivers/platform/x86/ from drivers/misc/
16d7523 thermal: Create CONFIG_THERMAL_HWMON=n
ff16cab thermal: re-name thermal.c to thermal_sys.c
e68b16a thermal: add hwmon sysfs I/F
9ec732f thermal: add new get_crit_temp callback
63c4ec9 thermal: add the support for building the generic thermal as a
module
5f1a3f2 acpi thermal trip points increased to 12
a0dd25b ACPI: thermal: buildfix for CONFIG_THERMAL=n
041d4bb ACPI: CELSIUS_TO_KELVIN fixup
203d3d4 the generic thermal sysfs driver

Signed-off-by: Sumeet Pawnikar <sumeet.r.pawnikar@intel.com>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant