| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20120731130522.GA7287@lizard>
Date: Tue, 31 Jul 2012 06:05:22 -0700
From: Anton Vorontsov <cbouatmailru@...il.com>
To: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: Andrew Morton <akpm@...ux-foundation.org>,
David Woodhouse <dwmw2@...radead.org>,
Stephen Rothwell <sfr@...b.auug.org.au>,
linux-kernel@...r.kernel.org
Subject: [GIT PULL] battery-2.6.git
Hello Linus,
It's almost a normal pull request: a bunch of small fixes and assorted
enhancements, and as usual my gpg key is not signed, etc.
One thing makes it unusual, though: one of our patches added thermal
support for power supply class, but thermal/ subsystem changed under our
feet. We (well, Stephen, that is) caught the issue and it was decided[1]
that I'd just delay the battery pull request, and then will fix it up by
merging your tree back into mine at the specific commit. And I did
exactly that.
That's not all though: another[2] small fixup for thermal subsystem was
needed to get rid of a warning in power supply subsystem (the warning
was not drivers/power's "fault", the thermal registration function just
needed a proper const annotation, which is also done by a small commit
on top of the merge.
So, to sum this up:
- The 'master' branch of the battery tree was in -next for weeks,
and was never rebased, altered etc;
- for-v3.6 tag contains the 'master' branch + merge + the warning fix.
Thanks!
[1] http://lkml.org/lkml/2012/6/19/23
[2] http://lkml.org/lkml/2012/6/18/28
The following changes since commit c56f5c0342dfee11a1a13d2f5bb7618de5b17590:
Thermal: Make Thermal trip points writeable (2012-07-24 23:17:20 -0400)
are available in the git repository at:
git://git.infradead.org/battery-2.6.git tags/for-v3.6
for you to fetch changes up to 4b1bf5871f7d59de6484cc887e205d6d2f1e6fbd:
thermal: Constify 'type' argument for the registration routine (2012-07-31 05:45:37 -0700)
----------------------------------------------------------------
Anton Vorontsov (3):
ds2781_battery: w1_ds2781_read() should be static
Merge with upstream to accommodate with thermal changes
thermal: Constify 'type' argument for the registration routine
Chanwoo Choi (3):
charger-manager: Use EXTCON Subsystem to detect charger cables for charging
charger-manager: Set current limit of regulator for over current protection
charger-manager: Fix build break related to EXTCON
Dmitry Eremin-Solenikov (2):
test_power: Add support for USB AC source
test_power: Add VOLTAGE_NOW and BATTERY_TEMP properties
Jenny TC (1):
power_supply: Register battery as a thermal zone
Kim, Milo (1):
lp8727_charger: Move header file into platform_data directory
Mark Brown (1):
pda_power: Complain if regulator operations fail
NeilBrown (3):
twl4030_charger: Fix some typos
twl4030_charger: Add backup-battery charging
twl4030_charger: Allow charger to control the regulator that feeds it
Nikolaus Voss (1):
sbs-battery: Don't trigger false supply_changed event
Pritesh Raithatha (1):
gpio-charger: Use cansleep version of gpio_set_value
Ramakrishna Pallala (4):
power_supply: Add constant charge_current and charge_voltage properties
smb347-charger: Add constant charge and current properties
max17042_battery: Support CHARGE_COUNTER power supply attribute
power_supply: Add min/max alert properties for CAPACITY, TEMP, TEMP_AMBIENT
Richard A. Smith (2):
olpc-battery: Add VOLTAGE_MAX_DESIGN property
olpc-battery: update CHARGE_FULL_DESIGN property for BYD LiFe batteries
Saranya Gopal (1):
bq27x00_battery: Add support for BQ27425 chip
Syed Rafiuddin (1):
bq27x00_battery: Add support for power average and health properties
Documentation/power/power_supply_class.txt | 10 ++
drivers/mfd/twl-core.c | 9 +-
drivers/power/Kconfig | 1 +
drivers/power/bq27x00_battery.c | 155 +++++++++++++++++++++++++---
drivers/power/charger-manager.c | 152 ++++++++++++++++++++++++---
drivers/power/ds2781_battery.c | 2 +-
drivers/power/gpio-charger.c | 2 +-
drivers/power/lp8727_charger.c | 2 +-
drivers/power/max17042_battery.c | 8 ++
drivers/power/olpc_battery.c | 62 ++++++++++-
drivers/power/pda_power.c | 4 +-
drivers/power/power_supply_core.c | 65 ++++++++++++
drivers/power/power_supply_sysfs.c | 8 ++
drivers/power/sbs-battery.c | 2 +-
drivers/power/smb347-charger.c | 123 ++++++++++++++++++++--
drivers/power/test_power.c | 75 ++++++++++++++
drivers/power/twl4030_charger.c | 80 +++++++++++++-
drivers/thermal/thermal_sys.c | 2 +-
include/linux/i2c/twl.h | 2 +
include/linux/{ => platform_data}/lp8727.h | 0
include/linux/power/charger-manager.h | 67 +++++++++++-
include/linux/power_supply.h | 13 +++
include/linux/thermal.h | 2 +-
23 files changed, 789 insertions(+), 57 deletions(-)
rename include/linux/{ => platform_data}/lp8727.h (100%)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists