linux-next: manual merge of the hwmon-staging tree with the jdelvare-hwmon tree

linux-next: manual merge of the hwmon-staging tree with the jdelvare-hwmon tree

[Stephen Rothwell]

Hi Guenter,

Today's linux-next merge of the hwmon-staging tree got a conflict in
drivers/hwmon/dme1737.c between commit
b7f2a5c8c9190fcf0126d43972a8ad37eb98f5d0 ("hwmon: (dme1737) Minor
cleanups") from the jdelvare-hwmon tree and commit
9c6e13b411cf0f656b7d7a78ec35bf0069f631bb ("hwmon: (dme1737) Use pr_fmt
and pr_<level>") from the hwmon-staging 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 drivers/hwmon/dme1737.c
index a3430e3,e9a610b..0000000
--- a/drivers/hwmon/dme1737.c
+++ b/drivers/hwmon/dme1737.c
@@@ -2497,10 -2446,9 +2499,10 @@@ static int __init dme1737_isa_detect(in
  	dme1737_sio_outb(sio_cip, 0x07, 0x0a);
  
  	/* Get the base address of the runtime registers */
 -	if (!(base_addr = (dme1737_sio_inb(sio_cip, 0x60) << 8) |
 -			   dme1737_sio_inb(sio_cip, 0x61))) {
 +	base_addr = (dme1737_sio_inb(sio_cip, 0x60) << 8) |
 +		     dme1737_sio_inb(sio_cip, 0x61);
 +	if (!base_addr) {
- 		printk(KERN_ERR "dme1737: Base address not set.\n");
+ 		pr_err("Base address not set\n");
  		err = -ENODEV;
  		goto exit;
  	}
@@@ -2528,24 -2476,19 +2530,22 @@@ static int __init dme1737_isa_device_ad
  	if (err)
  		goto exit;
  
 -	if (!(pdev = platform_device_alloc("dme1737", addr))) {
 +	pdev = platform_device_alloc("dme1737", addr);
 +	if (!pdev) {
- 		printk(KERN_ERR "dme1737: Failed to allocate device.\n");
+ 		pr_err("Failed to allocate device\n");
  		err = -ENOMEM;
  		goto exit;
  	}
  
 -	if ((err = platform_device_add_resources(pdev, &res, 1))) {
 +	err = platform_device_add_resources(pdev, &res, 1);
 +	if (err) {
- 		printk(KERN_ERR "dme1737: Failed to add device resource "
- 		       "(err = %d).\n", err);
+ 		pr_err("Failed to add device resource (err = %d)\n", err);
  		goto exit_device_put;
  	}
  
 -	if ((err = platform_device_add(pdev))) {
 +	err = platform_device_add(pdev);
 +	if (err) {
- 		printk(KERN_ERR "dme1737: Failed to add device (err = %d).\n",
- 		       err);
+ 		pr_err("Failed to add device (err = %d)\n", err);
  		goto exit_device_put;
  	}
  

Re: linux-next: manual merge of the hwmon-staging tree with the jdelvare-hwmon tree

[Guenter Roeck]

On Sun, Jan 09, 2011 at 09:20:57PM -0500, Stephen Rothwell wrote:
> Hi Guenter,
> 
> Today's linux-next merge of the hwmon-staging tree got a conflict in
> drivers/hwmon/dme1737.c between commit
> b7f2a5c8c9190fcf0126d43972a8ad37eb98f5d0 ("hwmon: (dme1737) Minor
> cleanups") from the jdelvare-hwmon tree and commit
> 9c6e13b411cf0f656b7d7a78ec35bf0069f631bb ("hwmon: (dme1737) Use pr_fmt
> and pr_<level>") from the hwmon-staging 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
> 
Hi Stephen,

thanks for the note. I suspected that would happen - sorry for the trouble.

Jean, do you want to take Joe's pr_fmt change from my tree and apply it to yours,
or should we just wait until the first of the trees was merged into Linus' tree ?
If the latter, do you want to send your patches to Linus first, or should I go first ?
I am ready to go.

Thanks,
Guenter

Re: linux-next: manual merge of the hwmon-staging tree with the jdelvare-hwmon tree

[Stephen Rothwell]

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

Hi Guenter,

On Sun, 9 Jan 2011 19:46:38 -0800 Guenter Roeck <guenter.roeck@ericsson.com> wrote:
>
> thanks for the note. I suspected that would happen - sorry for the trouble.
> 
> Jean, do you want to take Joe's pr_fmt change from my tree and apply it to yours,
> or should we just wait until the first of the trees was merged into Linus' tree ?
> If the latter, do you want to send your patches to Linus first, or should I go first ?
> I am ready to go.

I wouldn't worry too much, Linus is cleverer me and will work it out.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

Re: linux-next: manual merge of the hwmon-staging tree with the jdelvare-hwmon tree

[Jean Delvare]

On Sun, 9 Jan 2011 19:46:38 -0800, Guenter Roeck wrote:
> On Sun, Jan 09, 2011 at 09:20:57PM -0500, Stephen Rothwell wrote:
> > Hi Guenter,
> > 
> > Today's linux-next merge of the hwmon-staging tree got a conflict in
> > drivers/hwmon/dme1737.c between commit
> > b7f2a5c8c9190fcf0126d43972a8ad37eb98f5d0 ("hwmon: (dme1737) Minor
> > cleanups") from the jdelvare-hwmon tree and commit
> > 9c6e13b411cf0f656b7d7a78ec35bf0069f631bb ("hwmon: (dme1737) Use pr_fmt
> > and pr_<level>") from the hwmon-staging 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
> > 
> Hi Stephen,
> 
> thanks for the note. I suspected that would happen - sorry for the trouble.
> 
> Jean, do you want to take Joe's pr_fmt change from my tree and apply it to yours,
> or should we just wait until the first of the trees was merged into Linus' tree ?
> If the latter, do you want to send your patches to Linus first, or should I go first ?
> I am ready to go.

Let's be good citizens and sort out the conflict before sending the
patches to Linus. I shall pick the pr_fmt change patch in my own tree.

But where do I pick it?
ftp://pub.kernel.org/pub/linux/kernel/people/groeck/linux-staging/ is
no longer relevant, right? Maybe you can delete it altogether to clear
up the confusion. Care to point me to somewhere I can download the
pr_fmt change patch?

As for sending your patches to Linus for 2.6.38, yes, please send them
as soon as possible. I am still not done processing all the mails I
received during my vacation, and I must send my i2c patches too, so
it's better if you don't wait for me and send your patches first.

Thanks,
-- 
Jean Delvare

Re: linux-next: manual merge of the hwmon-staging tree with the jdelvare-hwmon tree

[Jean Delvare]

On Sun, 9 Jan 2011 19:46:38 -0800, Guenter Roeck wrote:
> On Sun, Jan 09, 2011 at 09:20:57PM -0500, Stephen Rothwell wrote:
> > Hi Guenter,
> > 
> > Today's linux-next merge of the hwmon-staging tree got a conflict in
> > drivers/hwmon/dme1737.c between commit
> > b7f2a5c8c9190fcf0126d43972a8ad37eb98f5d0 ("hwmon: (dme1737) Minor
> > cleanups") from the jdelvare-hwmon tree and commit
> > 9c6e13b411cf0f656b7d7a78ec35bf0069f631bb ("hwmon: (dme1737) Use pr_fmt
> > and pr_<level>") from the hwmon-staging 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
> > 
> Hi Stephen,
> 
> thanks for the note. I suspected that would happen - sorry for the trouble.
> 
> Jean, do you want to take Joe's pr_fmt change from my tree and apply it to yours,
> or should we just wait until the first of the trees was merged into Linus' tree ?
> If the latter, do you want to send your patches to Linus first, or should I go first ?
> I am ready to go.

Let's be good citizens and sort out the conflict before sending the
patches to Linus. I shall pick the pr_fmt change patch in my own tree.

But where do I pick it?
ftp://pub.kernel.org/pub/linux/kernel/people/groeck/linux-staging/ is
no longer relevant, right? Maybe you can delete it altogether to clear
up the confusion. Care to point me to somewhere I can download the
pr_fmt change patch?

As for sending your patches to Linus for 2.6.38, yes, please send them
as soon as possible. I am still not done processing all the mails I
received during my vacation, and I must send my i2c patches too, so
it's better if you don't wait for me and send your patches first.

Thanks,
-- 
Jean Delvare

Re: linux-next: manual merge of the hwmon-staging tree with the jdelvare-hwmon tree

[Guenter Roeck]

On Mon, Jan 10, 2011 at 03:57:43AM -0500, Jean Delvare wrote:
> On Sun, 9 Jan 2011 19:46:38 -0800, Guenter Roeck wrote:
> > On Sun, Jan 09, 2011 at 09:20:57PM -0500, Stephen Rothwell wrote:
> > > Hi Guenter,
> > > 
> > > Today's linux-next merge of the hwmon-staging tree got a conflict in
> > > drivers/hwmon/dme1737.c between commit
> > > b7f2a5c8c9190fcf0126d43972a8ad37eb98f5d0 ("hwmon: (dme1737) Minor
> > > cleanups") from the jdelvare-hwmon tree and commit
> > > 9c6e13b411cf0f656b7d7a78ec35bf0069f631bb ("hwmon: (dme1737) Use pr_fmt
> > > and pr_<level>") from the hwmon-staging 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
> > > 
> > Hi Stephen,
> > 
> > thanks for the note. I suspected that would happen - sorry for the trouble.
> > 
> > Jean, do you want to take Joe's pr_fmt change from my tree and apply it to yours,
> > or should we just wait until the first of the trees was merged into Linus' tree ?
> > If the latter, do you want to send your patches to Linus first, or should I go first ?
> > I am ready to go.
> 
> Let's be good citizens and sort out the conflict before sending the
> patches to Linus. I shall pick the pr_fmt change patch in my own tree.
> 
> But where do I pick it?
> ftp://pub.kernel.org/pub/linux/kernel/people/groeck/linux-staging/ is
> no longer relevant, right? Maybe you can delete it altogether to clear
> up the confusion. Care to point me to somewhere I can download the
> pr_fmt change patch?
> 
Try again; I updated it.

hwmon-next/0007-hwmon-dme1737-Use-pr_fmt-and-pr_-level.patch

In general, I keep my git tree up to date.

git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging.git

You can get it from there as well.

> As for sending your patches to Linus for 2.6.38, yes, please send them
> as soon as possible. I am still not done processing all the mails I
> received during my vacation, and I must send my i2c patches too, so
> it's better if you don't wait for me and send your patches first.
> 
Ok. Do you want me to take out the dme1737 patch ?

Guenter

Re: linux-next: manual merge of the hwmon-staging tree with the jdelvare-hwmon tree

[Jean Delvare]

On Mon, 10 Jan 2011 02:16:23 -0800, Guenter Roeck wrote:
> On Mon, Jan 10, 2011 at 03:57:43AM -0500, Jean Delvare wrote:
> > Let's be good citizens and sort out the conflict before sending the
> > patches to Linus. I shall pick the pr_fmt change patch in my own tree.
> > 
> > But where do I pick it?
> > ftp://pub.kernel.org/pub/linux/kernel/people/groeck/linux-staging/ is
> > no longer relevant, right? Maybe you can delete it altogether to clear
> > up the confusion. Care to point me to somewhere I can download the
> > pr_fmt change patch?
> > 
> Try again; I updated it.
> 
> hwmon-next/0007-hwmon-dme1737-Use-pr_fmt-and-pr_-level.patch

Hmm, apparently syncing is down or slow, I don't see it yet. Will look
again later.

> In general, I keep my git tree up to date.
> 
> git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging.git
> 
> You can get it from there as well.
> 
> > As for sending your patches to Linus for 2.6.38, yes, please send them
> > as soon as possible. I am still not done processing all the mails I
> > received during my vacation, and I must send my i2c patches too, so
> > it's better if you don't wait for me and send your patches first.
> > 
> Ok. Do you want me to take out the dme1737 patch ?

If you send your patches to Linus today, it doesn't actually make a
difference. So, whatever is easier for you.

-- 
Jean Delvare

Re: linux-next: manual merge of the hwmon-staging tree with the jdelvare-hwmon tree

[Jean Delvare]

On Mon, 10 Jan 2011 02:16:23 -0800, Guenter Roeck wrote:
> On Mon, Jan 10, 2011 at 03:57:43AM -0500, Jean Delvare wrote:
> > Let's be good citizens and sort out the conflict before sending the
> > patches to Linus. I shall pick the pr_fmt change patch in my own tree.
> > 
> > But where do I pick it?
> > ftp://pub.kernel.org/pub/linux/kernel/people/groeck/linux-staging/ is
> > no longer relevant, right? Maybe you can delete it altogether to clear
> > up the confusion. Care to point me to somewhere I can download the
> > pr_fmt change patch?
> > 
> Try again; I updated it.
> 
> hwmon-next/0007-hwmon-dme1737-Use-pr_fmt-and-pr_-level.patch

Hmm, apparently syncing is down or slow, I don't see it yet. Will look
again later.

> In general, I keep my git tree up to date.
> 
> git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging.git
> 
> You can get it from there as well.
> 
> > As for sending your patches to Linus for 2.6.38, yes, please send them
> > as soon as possible. I am still not done processing all the mails I
> > received during my vacation, and I must send my i2c patches too, so
> > it's better if you don't wait for me and send your patches first.
> > 
> Ok. Do you want me to take out the dme1737 patch ?

If you send your patches to Linus today, it doesn't actually make a
difference. So, whatever is easier for you.

-- 
Jean Delvare

Re: linux-next: manual merge of the hwmon-staging tree with the jdelvare-hwmon tree

[Guenter Roeck]

On Mon, Jan 10, 2011 at 05:47:50AM -0500, Jean Delvare wrote:
> On Mon, 10 Jan 2011 02:16:23 -0800, Guenter Roeck wrote:
> > On Mon, Jan 10, 2011 at 03:57:43AM -0500, Jean Delvare wrote:
> > > Let's be good citizens and sort out the conflict before sending the
> > > patches to Linus. I shall pick the pr_fmt change patch in my own tree.
> > > 
> > > But where do I pick it?
> > > ftp://pub.kernel.org/pub/linux/kernel/people/groeck/linux-staging/ is
> > > no longer relevant, right? Maybe you can delete it altogether to clear
> > > up the confusion. Care to point me to somewhere I can download the
> > > pr_fmt change patch?
> > > 
> > Try again; I updated it.
> > 
> > hwmon-next/0007-hwmon-dme1737-Use-pr_fmt-and-pr_-level.patch
> 
> Hmm, apparently syncing is down or slow, I don't see it yet. Will look
> again later.
> 
> > In general, I keep my git tree up to date.
> > 
> > git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging.git
> > 
> > You can get it from there as well.
> > 
> > > As for sending your patches to Linus for 2.6.38, yes, please send them
> > > as soon as possible. I am still not done processing all the mails I
> > > received during my vacation, and I must send my i2c patches too, so
> > > it's better if you don't wait for me and send your patches first.
> > > 
> > Ok. Do you want me to take out the dme1737 patch ?
> 
> If you send your patches to Linus today, it doesn't actually make a
> difference. So, whatever is easier for you.
> 
Ok, let's do it that way.

Sorry for the whole trouble. The patches you applied do not follow
Documentation/CodingStyle, and I did not want to apply them without your
approval. I thought I sent you a note, but looks like that got lost in my own
vacation.

Guenter

Re: linux-next: manual merge of the hwmon-staging tree with the jdelvare-hwmon tree

[Stephen Rothwell]

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

Hi Guenter,

On Sun, 20 Feb 2011 18:17:08 -0800 Guenter Roeck <guenter.roeck@ericsson.com> wrote:
>
> yes, it would be great if you can carry the fix if it doesn't make too much trouble.
> I don't see an easy way around it.

These sort of conflict fixes are easy to carry ("git rerere" does it for me).

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

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

Re: linux-next: manual merge of the hwmon-staging tree with the jdelvare-hwmon tree

[Guenter Roeck]

On Sun, Feb 20, 2011 at 08:19:44PM -0500, Stephen Rothwell wrote:
> Hi Guenter,
> 
> Today's linux-next merge of the hwmon-staging tree got a conflict in
> drivers/hwmon/Makefile between commits
> bb6cd76e2364b13de54314aeadd9f61b75335caa ("Let Kconfig handle lis3lv02d
> dependencies") and d8f00f1b531b25ac96a39385617ff1718bc8474b ("Move
> lis3lv02d drivers to drivers/misc") from the jdelvare-hwmon tree and
> commit 2c37a4a61ef4efaa7a802e0757d783d9b54ad064 ("hwmon: Add support for
> Lineage Compact Power Line PEM devices") from the hwmon-staging tree.
> 
> Just context changes.  I fixed it up (see below) and can carry the fix as
> necessary.

Hi Stephen,

yes, it would be great if you can carry the fix if it doesn't make too much trouble.
I don't see an easy way around it.

Thanks,
Guenter

linux-next: manual merge of the hwmon-staging tree with the jdelvare-hwmon tree

[Stephen Rothwell]

Hi Guenter,

Today's linux-next merge of the hwmon-staging tree got a conflict in
drivers/hwmon/Makefile between commits
bb6cd76e2364b13de54314aeadd9f61b75335caa ("Let Kconfig handle lis3lv02d
dependencies") and d8f00f1b531b25ac96a39385617ff1718bc8474b ("Move
lis3lv02d drivers to drivers/misc") from the jdelvare-hwmon tree and
commit 2c37a4a61ef4efaa7a802e0757d783d9b54ad064 ("hwmon: Add support for
Lineage Compact Power Line PEM devices") from the hwmon-staging 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 drivers/hwmon/Makefile
index 753117c,4681981..0000000
--- a/drivers/hwmon/Makefile
+++ b/drivers/hwmon/Makefile
@@@ -62,6 -62,10 +62,7 @@@ obj-$(CONFIG_SENSORS_JC42)	+= jc42.
  obj-$(CONFIG_SENSORS_JZ4740)	+= jz4740-hwmon.o
  obj-$(CONFIG_SENSORS_K8TEMP)	+= k8temp.o
  obj-$(CONFIG_SENSORS_K10TEMP)	+= k10temp.o
+ obj-$(CONFIG_SENSORS_LINEAGE)	+= lineage-pem.o
 -obj-$(CONFIG_SENSORS_LIS3LV02D) += lis3lv02d.o hp_accel.o
 -obj-$(CONFIG_SENSORS_LIS3_SPI)	+= lis3lv02d.o lis3lv02d_spi.o
 -obj-$(CONFIG_SENSORS_LIS3_I2C)	+= lis3lv02d.o lis3lv02d_i2c.o
  obj-$(CONFIG_SENSORS_LM63)	+= lm63.o
  obj-$(CONFIG_SENSORS_LM70)	+= lm70.o
  obj-$(CONFIG_SENSORS_LM73)	+= lm73.o