linux-next: manual merge of the acpi tree with Linus' tree

linux-next: manual merge of the acpi tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1086 bytes --]

Hi Len,

Today's linux-next merge of the acpi tree got a conflict in
include/acpi/acpixf.h between commit a1ce39288e6f ("UAPI: (Scripted)
Convert #include "..." to #include <path/...> in kernel system headers")
from Linus' tree and commit be030a576854 ("ACPICA: Add support for
complex _PLD buffers") from the acpi tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc include/acpi/acpixf.h
index 51405d3,267bfc4..0000000
--- a/include/acpi/acpixf.h
+++ b/include/acpi/acpixf.h
@@@ -47,11 -47,12 +47,12 @@@
  
  /* Current ACPICA subsystem version in YYYYMMDD format */
  
- #define ACPI_CA_VERSION                 0x20120711
+ #define ACPI_CA_VERSION                 0x20120913
  
 -#include "acconfig.h"
 -#include "actypes.h"
 -#include "actbl.h"
 -#include "acbuffer.h"
 +#include <acpi/acconfig.h>
 +#include <acpi/actypes.h>
 +#include <acpi/actbl.h>
++#include <acpi/acbuffer.h>
  
  extern u8 acpi_gbl_permanent_mmap;
  

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

linux-next: manual merge of the acpi tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 537 bytes --]

Hi Len,

Today's linux-next merge of the acpi tree got a conflict in
include/acpi/acpixf.h between commit d8dc91b753b8 ("Merge branch
'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux")
from Linus' tree and commit 558dc6f9ee2a ("Merge branch 'upstream' into
next") from the acpi tree (which, as I pointed out, fixed the merge
conflict incorrectly).

I just used the version from Linus' tree.  Len, please fix up your "next"
branch.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

linux-next: manual merge of the acpi tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 848 bytes --]

Hi Len,

Today's linux-next merge of the acpi tree got a conflict in
arch/arm/mach-shmobile/cpuidle.c between commit 9f97da78bf01
("Disintegrate asm/system.h for ARM") from Linus' tree and commit
ee807dd89c00 ("ARM: shmobile: Consolidate time keeping and irq enable")
from the acpi tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/arm/mach-shmobile/cpuidle.c
index 21b09b6,ca23b20..0000000
--- a/arch/arm/mach-shmobile/cpuidle.c
+++ b/arch/arm/mach-shmobile/cpuidle.c
@@@ -13,6 -13,8 +13,7 @@@
  #include <linux/suspend.h>
  #include <linux/module.h>
  #include <linux/err.h>
 -#include <asm/system.h>
+ #include <asm/cpuidle.h>
  #include <asm/io.h>
  
  static void shmobile_enter_wfi(void)

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

linux-next: manual merge of the acpi tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 524 bytes --]

Hi Len,

Today's linux-next merge of the acpi tree got a conflict in
drivers/acpi/sleep.c between commit
7d6fb7bd1919517937ec390f6ca2d7bcf4f89fb6 ("ACPI: sleep: eliminate
duplicate entries in acpisleep_dmi_table[]") from Linus' tree and commit
7e962fbadef538365228962b9dd869f95d745dd5 ("ACPI: delete DMI blacklist for
sci_en_on_resume") from the acpi tree.

I fixed it up and can carry the fix for a while.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]

Re: linux-next: manual merge of the acpi tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 334 bytes --]

Hi Len,

On Wed, 20 Jan 2010 01:12:08 -0500 (EST) Len Brown <lenb@kernel.org> wrote:
>
> I was carrying it because it was originally filed against ACPI,
> but now that Eric has it, I can drop my version.

OK, thanks.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]

Re: linux-next: manual merge of the acpi tree with Linus' tree

[Len Brown]

Thanks Stephen,
I was carrying it because it was originally filed against ACPI,
but now that Eric has it, I can drop my version.

cheers,
Len Brown, Intel Open Source Technology Center

On Mon, 18 Jan 2010, Stephen Rothwell wrote:

> Hi Len,
> 
> Today's linux-next merge of the acpi tree got a conflict in
> drivers/gpu/drm/i915/intel_lvds.c between commit
> 40f33a92100f4d9b6e85ad642100cfe42d7ff57d ("drm/i915: Add HP
> nx9020/SamsungSX20S to ACPI LID quirk list") from Linus' tree and commit
> 25fbdd0b66c193607ed058662e06d29345766c17 ("drm/i915: Add HP
> nx9020/Samsung SX20S to ACPI LID quirk list") from the acpi tree.
> 
> Clearly two (slightly different) versions of the same change.  I used the
> version from the drm tree.
> -- 
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
> http://www.canb.auug.org.au/~sfr/
> 

linux-next: manual merge of the acpi tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 597 bytes --]

Hi Len,

Today's linux-next merge of the acpi tree got a conflict in
drivers/gpu/drm/i915/intel_lvds.c between commit
40f33a92100f4d9b6e85ad642100cfe42d7ff57d ("drm/i915: Add HP
nx9020/SamsungSX20S to ACPI LID quirk list") from Linus' tree and commit
25fbdd0b66c193607ed058662e06d29345766c17 ("drm/i915: Add HP
nx9020/Samsung SX20S to ACPI LID quirk list") from the acpi tree.

Clearly two (slightly different) versions of the same change.  I used the
version from the drm tree.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]

Re: linux-next: manual merge of the acpi tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 356 bytes --]

Hi Len,

On Thu, 24 Dec 2009 15:05:06 -0500 (EST) Len Brown <lenb@kernel.org> wrote:
>
> FYI, I dropped that patch yesterday, and then just now included
> a refreshed patch from Dmitry.  So linux-next should be conflict free now.

Thanks.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]

Re: linux-next: manual merge of the acpi tree with Linus' tree

[Len Brown]

> > Simpler to just drop the offending patch:
> > 
> > a287e9f941cf4bb8c167802c0f1cf04a93bc4e4c
> > sony-laptop: remove private workqueue, use keventd instead
> > 
> > and get a properly refreshed version of that from Dmitry/Mattia later.
> 
> Yep, that would work, thanks.

FYI, I dropped that patch yesterday, and then just now included
a refreshed patch from Dmitry.  So linux-next should be conflict free now.

thanks,
Len Brown, Intel Open Source Technology Center

Re: linux-next: manual merge of the acpi tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 466 bytes --]

Hi Len,

On Thu, 24 Dec 2009 00:02:21 -0500 (EST) Len Brown <lenb@kernel.org> wrote:
>
> Simpler to just drop the offending patch:
> 
> a287e9f941cf4bb8c167802c0f1cf04a93bc4e4c
> sony-laptop: remove private workqueue, use keventd instead
> 
> and get a properly refreshed version of that from Dmitry/Mattia later.

Yep, that would work, thanks.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]

Re: linux-next: manual merge of the acpi tree with Linus' tree

[Len Brown]

Stephen,

Simpler to just drop the offending patch:

a287e9f941cf4bb8c167802c0f1cf04a93bc4e4c
sony-laptop: remove private workqueue, use keventd instead

and get a properly refreshed version of that from Dmitry/Mattia later.

thanks,
Len Brown, Intel Open Source Technology Center

Re: linux-next: manual merge of the acpi tree with Linus' tree

[Stephen Rothwell]

Hi Len,

On Thu, 24 Dec 2009 09:39:13 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> On Thu, 24 Dec 2009 09:11:41 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > Today's linux-next merge of the acpi tree got a conflict in
> > drivers/platform/x86/sony-laptop.c between commits
> > 45465487897a1c6d508b14b904dc5777f7ec7e04 ("kfifo: move struct kfifo in
> > place"), c1e13f25674ed564948ecb7dfe5f83e578892896 ("kfifo: move out
> > spinlock") and 7acd72eb85f1c7a15e8b5eb554994949241737f1 ("kfifo: rename
> > kfifo_put... into kfifo_in... and kfifo_get... into kfifo_out...") from
> > Linus' tree and commit a287e9f941cf4bb8c167802c0f1cf04a93bc4e4c
> > ("sony-laptop: remove private workqueue, use keventd instead") from the
> > acpi tree.
> > 
> > I fixed it up (see below) and can cay the fix for a while.  This fix
> > needs checking.
> 
> I applied the following further patch (and there may be more fixes
> necessary).

drivers/platform/x86/sony-laptop.c: In function 'sony_laptop_remove_input':
drivers/platform/x86/sony-laptop.c:497: error: implicit declaration of function 'kfifo_get'

I needed this as well ...

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 24 Dec 2009 10:54:06 +1100
Subject: [PATCH] acpi: another fix for kfifo API change

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/platform/x86/sony-laptop.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c
index 84a1736..28c4a39 100644
--- a/drivers/platform/x86/sony-laptop.c
+++ b/drivers/platform/x86/sony-laptop.c
@@ -494,8 +494,9 @@ static void sony_laptop_remove_input(void)
 	cancel_delayed_work_sync(&sony_laptop_release_key_work);
 
 	/* Generate key-up events for remaining keys */
-	while (kfifo_get(sony_laptop_input.fifo,
-			 (unsigned char *)&kp, sizeof(kp)) == sizeof(kp)) {
+	while (kfifo_out_locked(&sony_laptop_input.fifo,
+			 (unsigned char *)&kp, sizeof(kp),
+			 &sony_laptop_input.fifo_lock) == sizeof(kp)) {
 		input_report_key(kp.dev, kp.key, 0);
 		input_sync(kp.dev);
 	}
-- 
1.6.5.4


-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

Re: linux-next: manual merge of the acpi tree with Linus' tree

[Stephen Rothwell]

Hi Len,

On Thu, 24 Dec 2009 09:11:41 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the acpi tree got a conflict in
> drivers/platform/x86/sony-laptop.c between commits
> 45465487897a1c6d508b14b904dc5777f7ec7e04 ("kfifo: move struct kfifo in
> place"), c1e13f25674ed564948ecb7dfe5f83e578892896 ("kfifo: move out
> spinlock") and 7acd72eb85f1c7a15e8b5eb554994949241737f1 ("kfifo: rename
> kfifo_put... into kfifo_in... and kfifo_get... into kfifo_out...") from
> Linus' tree and commit a287e9f941cf4bb8c167802c0f1cf04a93bc4e4c
> ("sony-laptop: remove private workqueue, use keventd instead") from the
> acpi tree.
> 
> I fixed it up (see below) and can cay the fix for a while.  This fix
> needs checking.

I applied the following further patch (and there may be more fixes
necessary).

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 24 Dec 2009 09:36:07 +1100
Subject: [PATCH] acpi: further update for __kfifo_len API change

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/platform/x86/sony-laptop.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c
index 9d05a1e..84a1736 100644
--- a/drivers/platform/x86/sony-laptop.c
+++ b/drivers/platform/x86/sony-laptop.c
@@ -317,7 +317,7 @@ static void do_sony_laptop_release_key(struct work_struct *work)
 	 * extra "empty" wakeup. This may be improved with the new
 	 * kfifo API.
 	 */
-	if (__kfifo_len(sony_laptop_input.fifo) != 0)
+	if (kfifo_len(&sony_laptop_input.fifo) != 0)
 		schedule_delayed_work(dwork, msecs_to_jiffies(10));
 }
 
-- 
1.6.5.4


-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

linux-next: manual merge of the acpi tree with Linus' tree

[Stephen Rothwell]

Hi Len,

Today's linux-next merge of the acpi tree got a conflict in
drivers/platform/x86/sony-laptop.c between commits
45465487897a1c6d508b14b904dc5777f7ec7e04 ("kfifo: move struct kfifo in
place"), c1e13f25674ed564948ecb7dfe5f83e578892896 ("kfifo: move out
spinlock") and 7acd72eb85f1c7a15e8b5eb554994949241737f1 ("kfifo: rename
kfifo_put... into kfifo_in... and kfifo_get... into kfifo_out...") from
Linus' tree and commit a287e9f941cf4bb8c167802c0f1cf04a93bc4e4c
("sony-laptop: remove private workqueue, use keventd instead") from the
acpi tree.

I fixed it up (see below) and can cay the fix for a while.  This fix
needs checking.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/platform/x86/sony-laptop.c
index 2896ca4,51314b4..0000000
--- a/drivers/platform/x86/sony-laptop.c
+++ b/drivers/platform/x86/sony-laptop.c
@@@ -142,9 -143,8 +143,8 @@@ struct sony_laptop_input_s 
  	atomic_t		users;
  	struct input_dev	*jog_dev;
  	struct input_dev	*key_dev;
 -	struct kfifo		*fifo;
 +	struct kfifo		fifo;
  	spinlock_t		fifo_lock;
- 	struct workqueue_struct	*wq;
  };
  
  static struct sony_laptop_input_s sony_laptop_input = {
@@@ -298,12 -300,12 +300,13 @@@ static int sony_laptop_input_keycode_ma
  /* release buttons after a short delay if pressed */
  static void do_sony_laptop_release_key(struct work_struct *work)
  {
+ 	struct delayed_work *dwork =
+ 			container_of(work, struct delayed_work, work);
  	struct sony_laptop_keypress kp;
  
- 	while (kfifo_out_locked(&sony_laptop_input.fifo, (unsigned char *)&kp,
 -	if (kfifo_get(sony_laptop_input.fifo,
 -		      (unsigned char *)&kp, sizeof(kp)) == sizeof(kp)) {
++	if (kfifo_out_locked(&sony_laptop_input.fifo, (unsigned char *)&kp,
 +			sizeof(kp), &sony_laptop_input.fifo_lock)
 +			== sizeof(kp)) {
- 		msleep(10);
  		input_report_key(kp.dev, kp.key, 0);
  		input_sync(kp.dev);
  	}
@@@ -363,13 -375,12 +376,14 @@@ static void sony_laptop_report_input_ev
  		/* we emit the scancode so we can always remap the key */
  		input_event(kp.dev, EV_MSC, MSC_SCAN, event);
  		input_sync(kp.dev);
+ 
+ 		/* schedule key release */
 -		kfifo_put(sony_laptop_input.fifo,
 -			  (unsigned char *)&kp, sizeof(kp));
 +		kfifo_in_locked(&sony_laptop_input.fifo,
 +			  (unsigned char *)&kp, sizeof(kp),
 +			  &sony_laptop_input.fifo_lock);
 +
- 		if (!work_pending(&sony_laptop_release_key_work))
- 			queue_work(sony_laptop_input.wq,
- 					&sony_laptop_release_key_work);
+ 		schedule_delayed_work(&sony_laptop_release_key_work,
+ 				      msecs_to_jiffies(10));
  	} else
  		dprintk("unknown input event %.2x\n", event);
  }
@@@ -470,11 -474,8 +475,8 @@@ err_unregister_keydev
  err_free_keydev:
  	input_free_device(key_dev);
  
- err_destroy_wq:
- 	destroy_workqueue(sony_laptop_input.wq);
- 
  err_free_kfifo:
 -	kfifo_free(sony_laptop_input.fifo);
 +	kfifo_free(&sony_laptop_input.fifo);
  
  err_dec_users:
  	atomic_dec(&sony_laptop_input.users);
@@@ -499,8 -508,7 +509,7 @@@ static void sony_laptop_remove_input(vo
  		sony_laptop_input.jog_dev = NULL;
  	}
  
- 	destroy_workqueue(sony_laptop_input.wq);
 -	kfifo_free(sony_laptop_input.fifo);
 +	kfifo_free(&sony_laptop_input.fifo);
  }
  
  /*********** Platform Device ***********/

linux-next: manual merge of the acpi tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1889 bytes --]

Hi Len,

Today's linux-next merge of the acpi tree got a conflict in
drivers/platform/x86/eeepc-laptop.c between commit
471452104b8520337ae2fb48c4e61cd4896e025d ("const: constify remaining
dev_pm_ops") from Linus' tree and commit
52bbe3c7b413d656833686f9f08e5dcab3786eeb ("eeepc-laptop: code movement")
from the acpi tree.

The latter just moved the code that the former was updating.  I fixed it
up (see below) and can carry the fix for a while.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/platform/x86/eeepc-laptop.c
index e647a85,d07a4c0..0000000
--- a/drivers/platform/x86/eeepc-laptop.c
+++ b/drivers/platform/x86/eeepc-laptop.c
@@@ -866,16 -862,37 +862,37 @@@ static int eeepc_hotk_restore(struct de
  	return 0;
  }
  
 -static struct dev_pm_ops eeepc_pm_ops = {
++static const struct dev_pm_ops eeepc_pm_ops = {
+ 	.thaw = eeepc_hotk_thaw,
+ 	.restore = eeepc_hotk_restore,
+ };
+ 
+ static struct platform_driver platform_driver = {
+ 	.driver = {
+ 		.name = EEEPC_LAPTOP_FILE,
+ 		.owner = THIS_MODULE,
+ 		.pm = &eeepc_pm_ops,
+ 	}
+ };
+ 
  /*
-  * Hwmon
+  * Hwmon device
   */
+ 
+ #define EEEPC_EC_SC00      0x61
+ #define EEEPC_EC_FAN_PWM   (EEEPC_EC_SC00 + 2) /* Fan PWM duty cycle (%) */
+ #define EEEPC_EC_FAN_HRPM  (EEEPC_EC_SC00 + 5) /* High byte, fan speed (RPM) */
+ #define EEEPC_EC_FAN_LRPM  (EEEPC_EC_SC00 + 6) /* Low byte, fan speed (RPM) */
+ 
+ #define EEEPC_EC_SFB0      0xD0
+ #define EEEPC_EC_FAN_CTRL  (EEEPC_EC_SFB0 + 3) /* Byte containing SF25  */
+ 
  static int eeepc_get_fan_pwm(void)
  {
- 	int value = 0;
+ 	u8 value = 0;
  
- 	read_acpi_int(NULL, EEEPC_EC_FAN_PWM, &value);
- 	value = value * 255 / 100;
- 	return (value);
+ 	ec_read(EEEPC_EC_FAN_PWM, &value);
+ 	return value * 255 / 100;
  }
  
  static void eeepc_set_fan_pwm(int value)

[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]

linux-next: manual merge of the acpi tree with Linus' tree

[Stephen Rothwell]

Hi Len,

Today's linux-next merge of the acpi tree got a conflict in
arch/x86/kernel/cpu/cpufreq/longhaul.c between commit
ac617bd0f7b959dc6708ad2f0d6b9dcf4382f1ed ("[CPUFREQ] checkpatch cleanups
for longhaul") from Linus' tree and commit
fb318cbff40964999f303d50bcf541dd9ead6780 ("ACPI: cpufreq: use new bit
register access function") from the acpi tree.

Just a context change.  I fixed it up (see below) and can carry it for a
while.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

diff --cc arch/x86/kernel/cpu/cpufreq/longhaul.c
index f1c51ae,4e18d51..0000000
--- a/arch/x86/kernel/cpu/cpufreq/longhaul.c
+++ b/arch/x86/kernel/cpu/cpufreq/longhaul.c
@@@ -328,10 -326,10 +328,10 @@@ retry_loop
  	case TYPE_POWERSAVER:
  		if (longhaul_flags & USE_ACPI_C3) {
  			/* Don't allow wakeup */
- 			acpi_set_register(ACPI_BITREG_BUS_MASTER_RLD, 0);
+ 			acpi_write_bit_register(ACPI_BITREG_BUS_MASTER_RLD, 0);
 -			do_powersaver(cx->address, clock_ratio_index, dir);
 +			do_powersaver(cx->address, mults_index, dir);
  		} else {
 -			do_powersaver(0, clock_ratio_index, dir);
 +			do_powersaver(0, mults_index, dir);
  		}
  		break;
  	}
@@@ -341,10 -339,10 +341,10 @@@
  		outb(0, 0x22);
  	} else if ((pr != NULL) && pr->flags.bm_control) {
  		/* Enable bus master arbitration */
- 		acpi_set_register(ACPI_BITREG_ARB_DISABLE, 0);
+ 		acpi_write_bit_register(ACPI_BITREG_ARB_DISABLE, 0);
  	}
 -	outb(pic2_mask,0xA1);	/* restore mask */
 -	outb(pic1_mask,0x21);
 +	outb(pic2_mask, 0xA1);	/* restore mask */
 +	outb(pic1_mask, 0x21);
  
  	local_irq_restore(flags);
  	preempt_enable();