diff options
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | acpi-update-battery-information-on-notification-0x81.patch | 38 | ||||
| -rw-r--r-- | kernel.spec | 10 | ||||
| -rw-r--r-- | sources | 3 |
4 files changed, 25 insertions, 29 deletions
diff --git a/.gitignore b/.gitignore index 69f0361ce..020c1d432 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,5 @@ patch-*.bz2 clog *.rpm kernel-2.6.*/ -/patch-2.6.37-rc7.bz2 +/patch-2.6.37-rc8.bz2 +/patch-2.6.37-rc8-git3.bz2 diff --git a/acpi-update-battery-information-on-notification-0x81.patch b/acpi-update-battery-information-on-notification-0x81.patch index 4eef6f931..7f2c645fc 100644 --- a/acpi-update-battery-information-on-notification-0x81.patch +++ b/acpi-update-battery-information-on-notification-0x81.patch @@ -13,32 +13,22 @@ and recreate the battery in order to populate the fields correctly. Signed-off-by: Matthew Garrett <mjg@redhat.com> --- - drivers/acpi/battery.c | 24 +++++++++++++++++------- - 1 files changed, 17 insertions(+), 7 deletions(-) + drivers/acpi/battery.c | 21 ++++++++++++++++----- + 1 files changed, 16 insertions(+), 5 deletions(-) diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c -index 9fb9d5a..8da9c88 100644 +index 95649d3..161e43a 100644 --- a/drivers/acpi/battery.c +++ b/drivers/acpi/battery.c -@@ -130,7 +130,7 @@ struct acpi_battery { - unsigned long flags; - }; +@@ -152,6 +152,7 @@ static int acpi_battery_technology(struct acpi_battery *battery) + return POWER_SUPPLY_TECHNOLOGY_UNKNOWN; + } --static int acpi_battery_update(struct acpi_battery *battery); +static int acpi_battery_update(struct acpi_battery *battery, bool get_info); + static int acpi_battery_get_state(struct acpi_battery *battery); - #define to_acpi_battery(x) container_of(x, struct acpi_battery, bat); - -@@ -186,7 +186,7 @@ static int acpi_battery_get_property(struct power_supply *psy, - int ret = 0; - struct acpi_battery *battery = to_acpi_battery(psy); - -- if (acpi_battery_update(battery)) -+ if (acpi_battery_update(battery, false)) - return -ENODEV; - - if (acpi_battery_present(battery)) { -@@ -610,9 +610,11 @@ static void acpi_battery_quirks2(struct acpi_battery *battery) + static int acpi_battery_is_charged(struct acpi_battery *battery) +@@ -605,9 +606,11 @@ static void acpi_battery_quirks2(struct acpi_battery *battery) } } @@ -51,7 +41,7 @@ index 9fb9d5a..8da9c88 100644 result = acpi_battery_get_status(battery); if (result) return result; -@@ -631,6 +633,14 @@ static int acpi_battery_update(struct acpi_battery *battery) +@@ -626,6 +629,14 @@ static int acpi_battery_update(struct acpi_battery *battery) } if (!battery->bat.dev) sysfs_add_battery(battery); @@ -66,7 +56,7 @@ index 9fb9d5a..8da9c88 100644 result = acpi_battery_get_state(battery); acpi_battery_quirks2(battery); return result; -@@ -808,7 +818,7 @@ static print_func acpi_print_funcs[ACPI_BATTERY_NUMFILES] = { +@@ -803,7 +814,7 @@ static print_func acpi_print_funcs[ACPI_BATTERY_NUMFILES] = { static int acpi_battery_read(int fid, struct seq_file *seq) { struct acpi_battery *battery = seq->private; @@ -75,7 +65,7 @@ index 9fb9d5a..8da9c88 100644 return acpi_print_funcs[fid](seq, result); } -@@ -919,7 +929,7 @@ static void acpi_battery_notify(struct acpi_device *device, u32 event) +@@ -914,7 +925,7 @@ static void acpi_battery_notify(struct acpi_device *device, u32 event) if (!battery) return; old = battery->bat.dev; @@ -84,7 +74,7 @@ index 9fb9d5a..8da9c88 100644 acpi_bus_generate_proc_event(device, event, acpi_battery_present(battery)); acpi_bus_generate_netlink_event(device->pnp.device_class, -@@ -948,7 +958,7 @@ static int acpi_battery_add(struct acpi_device *device) +@@ -943,7 +954,7 @@ static int acpi_battery_add(struct acpi_device *device) if (ACPI_SUCCESS(acpi_get_handle(battery->device->handle, "_BIX", &handle))) set_bit(ACPI_BATTERY_XINFO_PRESENT, &battery->flags); @@ -93,7 +83,7 @@ index 9fb9d5a..8da9c88 100644 #ifdef CONFIG_ACPI_PROCFS_POWER result = acpi_battery_add_fs(device); #endif -@@ -989,7 +999,7 @@ static int acpi_battery_resume(struct acpi_device *device) +@@ -984,7 +995,7 @@ static int acpi_battery_resume(struct acpi_device *device) return -EINVAL; battery = acpi_driver_data(device); battery->update_time = 0; diff --git a/kernel.spec b/kernel.spec index cff5226bd..101942c80 100644 --- a/kernel.spec +++ b/kernel.spec @@ -51,7 +51,7 @@ Summary: The Linux kernel # For non-released -rc kernels, this will be prepended with "0.", so # for example a 3 here will become 0.3 # -%global baserelease 2 +%global baserelease 1 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching @@ -82,9 +82,9 @@ Summary: The Linux kernel # The next upstream release sublevel (base_sublevel+1) %define upstream_sublevel %(echo $((%{base_sublevel} + 1))) # The rc snapshot level -%define rcrev 7 +%define rcrev 8 # The git snapshot level -%define gitrev 0 +%define gitrev 3 # Set rpm version accordingly %define rpmversion 2.6.%{upstream_sublevel} %endif @@ -1951,6 +1951,10 @@ fi # || || %changelog +* Mon Jan 03 2011 Kyle McMartin <kyle@redhat.com> 2.6.37-0.rc8.git3.1 +- Linux 2.6.37-rc8-git3 +- Merged acpi battery notification patch and -rc8. + * Thu Dec 23 2010 Kyle McMartin <kyle@redhat.com> - Pull in flexcop procfs rename patch since it's still not upstream. (#664852) @@ -1,2 +1,3 @@ 61f3739a73afb6914cb007f37fb09b62 linux-2.6.36.tar.bz2 -c879f40313f5ee305a3e324ddde957be patch-2.6.37-rc7.bz2 +19fc53ffe51f9b627badcd2c787b95fc patch-2.6.37-rc8.bz2 +6539e48b97d6fcc3560a40da5737cfbc patch-2.6.37-rc8-git3.bz2 |