[GIT] APM

[GIT] APM

[Jiri Kosina]

Linus,

please pull from 'for-linus' branch at

  git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm.git for-linus

to receive two patches for legacy APM code I am taking maintainership over 
from Stephen.

Thanks.

Jiri Kosina (1):
      APM: take over maintainership

Paul Parsons (1):
      apm-emulation: apm_mutex breaks ACK; remove it

 MAINTAINERS                  |    5 +++--
 drivers/char/apm-emulation.c |    5 -----
 2 files changed, 3 insertions(+), 7 deletions(-)

Re: [GIT] APM

[Rafael J. Wysocki]

On Friday, January 10, 2014 11:50:08 AM Jiri Kosina wrote:
> Rafael,
> 
> please consider pulling
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm.git for-next
> 
> into linux-pm.git, to receive:
> 
> 
> - addition of hibernation events to apm-emulation, from Bin Shi
> 
> 
> Thanks.
> 
> Bin Shi (1):
>       apm-emulation: add hibernation APM events to support suspend2disk
> 
>  drivers/char/apm-emulation.c  |   11 +++++++++--
>  include/uapi/linux/apm_bios.h |    2 ++
>  2 files changed, 11 insertions(+), 2 deletions(-)

Pulled, thanks Jiri!

-- 
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.

[GIT] APM

[Jiri Kosina]

Rafael,

please consider pulling

  git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm.git for-next

into linux-pm.git, to receive:


- addition of hibernation events to apm-emulation, from Bin Shi


Thanks.

Bin Shi (1):
      apm-emulation: add hibernation APM events to support suspend2disk

 drivers/char/apm-emulation.c  |   11 +++++++++--
 include/uapi/linux/apm_bios.h |    2 ++
 2 files changed, 11 insertions(+), 2 deletions(-)

-- 
Jiri Kosina
SUSE Labs

[GIT] APM

[Jiri Kosina]

Linus,

please pull from

  git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm.git for-linus

to receive one deadlock/race fix from Niel that got introduced when
we were moving away from freezer_*_count() to wait_event_freezable().

Thanks.

NeilBrown (1):
      APM: fix deadlock in APM_IOC_SUSPEND ioctl

 drivers/char/apm-emulation.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

-- 
Jiri Kosina
SUSE Labs

[GIT] APM

[Jiri Kosina]

Linus,

please pull from

  git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm.git for-linus

to receive one simple dependency fix for APM.

Thank you.

Paul Bolle (1):
      x86: Kconfig: drop unknown symbol 'APM_MODULE'

 arch/x86/Kconfig |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

-- 
Jiri Kosina
SUSE Labs

[GIT] APM

[Jiri Kosina]

Linus,

please pull from

  git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm.git for-linus

to receive update to legacy APM code.

Thanks.

Tejun Heo (1):
      apm-emulation: use wait_event_freezable() instead of freezer_[do_not_]count()

 drivers/char/apm-emulation.c |   16 ++++++----------
 1 files changed, 6 insertions(+), 10 deletions(-)

-- 
Jiri Kosina
SUSE Labs