linux-next: manual merge of the input tree with the s5p tree

linux-next: manual merge of the input tree with the s5p tree

[Stephen Rothwell]

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

Hi Dmitry,

Today's linux-next merge of the input tree got a conflict in
drivers/input/keyboard/Kconfig between commit 007205aa47e9 ("input:
samsung-keypad: Add HAVE_SAMSUNG_KEYPAD config option") from the s5p tree
and commit 5862c02d745f ("Input: samsung-keypad - enable compiling on
other platforms") from the input tree.

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

diff --cc drivers/input/keyboard/Kconfig
index d80b4ea,cdc385b..0000000
--- a/drivers/input/keyboard/Kconfig
+++ b/drivers/input/keyboard/Kconfig
@@@ -423,18 -439,12 +439,19 @@@ config KEYBOARD_PMIC8XX
  	  To compile this driver as a module, choose M here: the module will
  	  be called pmic8xxx-keypad.
  
 +config HAVE_SAMSUNG_KEYPAD
 +	bool
 +	help
 +	  This will include Samsung Keypad controller driver support. If you
 +	  want to include Samsung Keypad support for any machine, kindly
 +	  select this in the respective mach-xxxx/Kconfig file.
 +
  config KEYBOARD_SAMSUNG
  	tristate "Samsung keypad support"
- 	depends on SAMSUNG_DEV_KEYPAD || HAVE_SAMSUNG_KEYPAD
 -	depends on HAVE_CLK
++	depends on HAVE_CLK || HAVE_SAMSUNG_KEYPAD
  	help
- 	  Say Y here if you want to use the Samsung keypad.
+ 	  Say Y here if you want to use the keypad on your Samsung mobile
+ 	  device.
  
  	  To compile this driver as a module, choose M here: the
  	  module will be called samsung-keypad.

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

Re: linux-next: manual merge of the input tree with the s5p tree

[Dmitry Torokhov]

Hi Stephen,

On Thursday, November 10, 2011 06:11:59 PM Stephen Rothwell wrote:
> Hi Dmitry,
> 
> Today's linux-next merge of the input tree got a conflict in
> drivers/input/keyboard/Kconfig between commit 007205aa47e9 ("input:
> samsung-keypad: Add HAVE_SAMSUNG_KEYPAD config option") from the s5p
> tree and commit 5862c02d745f ("Input: samsung-keypad - enable compiling
> on other platforms") from the input tree.
> 
> I have fixed it up (probably incorrectly - see below) and can carry the
> fix as necessary.

Please drop the whole HAVE_SAMSUNG_KEYPAD thing; HAVE_CLK is all
this driver needs. Expanding beyond Samsung will allow greater
compile coverage.

Thanks.

-- 
Dmitry

Re: linux-next: manual merge of the input tree with the s5p tree

[Stephen Rothwell]

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

Hi Dmitry,

On Thu, 10 Nov 2011 19:41:59 -0800 Dmitry Torokhov <dmitry.torokhov@gmail.com> wrote:
>
> Please drop the whole HAVE_SAMSUNG_KEYPAD thing; HAVE_CLK is all
> this driver needs. Expanding beyond Samsung will allow greater
> compile coverage.

OK, I have modified the conflict resolution for tomorrow.

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

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

RE: linux-next: manual merge of the input tree with the s5p tree

[Kukjin Kim]

Stephen Rothwell wrote:
> 
> Hi Dmitry,
> 
> On Thu, 10 Nov 2011 19:41:59 -0800 Dmitry Torokhov
> <dmitry.torokhov@gmail.com> wrote:
> >
> > Please drop the whole HAVE_SAMSUNG_KEYPAD thing; HAVE_CLK is all
> > this driver needs. Expanding beyond Samsung will allow greater
> > compile coverage.
> 
> OK, I have modified the conflict resolution for tomorrow.
> 
OK, I will git-revert it in my tree.

Sorry for late response.
Thanks.

Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.

Re: linux-next: manual merge of the input tree with the s5p tree

[Thomas Abraham]

Hi Dmitry,

On 11 November 2011 09:11, Dmitry Torokhov <dmitry.torokhov@gmail.com> wrote:
> Hi Stephen,
>
> On Thursday, November 10, 2011 06:11:59 PM Stephen Rothwell wrote:
>> Hi Dmitry,
>>
>> Today's linux-next merge of the input tree got a conflict in
>> drivers/input/keyboard/Kconfig between commit 007205aa47e9 ("input:
>> samsung-keypad: Add HAVE_SAMSUNG_KEYPAD config option") from the s5p
>> tree and commit 5862c02d745f ("Input: samsung-keypad - enable compiling
>> on other platforms") from the input tree.
>>
>> I have fixed it up (probably incorrectly - see below) and can carry the
>> fix as necessary.
>
> Please drop the whole HAVE_SAMSUNG_KEYPAD thing; HAVE_CLK is all
> this driver needs. Expanding beyond Samsung will allow greater
> compile coverage.

Thanks for the suggestion. I will modify device tree support for
samsung keypad driver that is merged in s5p tree for-next branch.

Regards,
Thomas.

>
> Thanks.
>
> --
> Dmitry
>

linux-next: manual merge of the input tree with the s5p tree

[Stephen Rothwell]

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

Hi Dmitry,

Today's linux-next merge of the input tree got a conflict in
drivers/input/keyboard/samsung-keypad.c between commit 532f74540134
("input: samsung-keypad: Add device tree support") from the s5p tree and
commit 400bf2995be6 ("Input: samsung-keypad - switch to using
SIMPLE_DEV_PM_OPS") from the input tree.

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

diff --cc drivers/input/keyboard/samsung-keypad.c
index 8a0060c,1a2b755..0000000
--- a/drivers/input/keyboard/samsung-keypad.c
+++ b/drivers/input/keyboard/samsung-keypad.c
@@@ -21,10 -21,8 +21,10 @@@
  #include <linux/module.h>
  #include <linux/platform_device.h>
  #include <linux/slab.h>
 +#include <linux/of.h>
 +#include <linux/of_gpio.h>
  #include <linux/sched.h>
- #include <plat/keypad.h>
+ #include <linux/input/samsung-keypad.h>
  
  #define SAMSUNG_KEYIFCON			0x00
  #define SAMSUNG_KEYIFSTSCLR			0x04
@@@ -578,24 -440,11 +578,22 @@@ static int samsung_keypad_resume(struc
  
  	return 0;
  }
- 
- static const struct dev_pm_ops samsung_keypad_pm_ops = {
- 	.suspend	= samsung_keypad_suspend,
- 	.resume		= samsung_keypad_resume,
- };
  #endif
  
 +#ifdef CONFIG_OF
 +static const struct of_device_id samsung_keypad_dt_match[] = {
 +	{ .compatible = "samsung,s3c6410-keypad" },
 +	{ .compatible = "samsung,s5pv210-keypad" },
 +	{},
 +};
 +MODULE_DEVICE_TABLE(of, samsung_keypad_dt_match);
 +#else
 +#define samsung_keypad_dt_match NULL
 +#endif
 +
+ static SIMPLE_DEV_PM_OPS(samsung_keypad_pm_ops,
+ 			 samsung_keypad_suspend, samsung_keypad_resume);
+ 
  static struct platform_device_id samsung_keypad_driver_ids[] = {
  	{
  		.name		= "samsung-keypad",
@@@ -614,10 -463,7 +612,8 @@@ static struct platform_driver samsung_k
  	.driver		= {
  		.name	= "samsung-keypad",
  		.owner	= THIS_MODULE,
 +		.of_match_table = samsung_keypad_dt_match,
- #ifdef CONFIG_PM
  		.pm	= &samsung_keypad_pm_ops,
- #endif
  	},
  	.id_table	= samsung_keypad_driver_ids,
  };

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

Re: linux-next: manual merge of the input tree with the s5p tree

[Dmitry Torokhov]

On Thursday, November 10, 2011 06:11:47 PM Stephen Rothwell wrote:
> Hi Dmitry,
> 
> Today's linux-next merge of the input tree got a conflict in
> drivers/input/keyboard/samsung-keypad.c between commit 532f74540134
> ("input: samsung-keypad: Add device tree support") from the s5p tree and
> commit 400bf2995be6 ("Input: samsung-keypad - switch to using
> SIMPLE_DEV_PM_OPS") from the input tree.
> 
> I fixed it up (see below) and can carry the fix as necessary.


Yep, looks good, thanks Stephen.

-- 
Dmitry

linux-next: manual merge of the input tree with the s5p tree

[Stephen Rothwell]

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

Hi Dmitry,

Today's linux-next merge of the input tree got a conflict in
arch/arm/plat-samsung/include/plat/keypad.h between commit
1e3241300503df18a098dd35098f6975dcf622e2 ("ARM: SAMSUNG: Add keypad
device support") from the s5p tree and commit
0fffed27f92d9d7a34de9fe017b7082b5958bb93 ("Input: samsung-keypad - Add
samsung keypad driver") from the input tree.

This just looks like two versions of the same driver (or two drivers
sharing the same header) - please sort this out.  I have fixed up the
header for today (by including both versions where necessary).

-- 
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 input tree with the s5p tree

[Stephen Rothwell]

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

Hi all,

On Thu, 22 Jul 2010 11:46:55 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the input tree got a conflict in
> arch/arm/plat-samsung/include/plat/keypad.h between commit
> 1e3241300503df18a098dd35098f6975dcf622e2 ("ARM: SAMSUNG: Add keypad
> device support") from the s5p tree and commit
> 0fffed27f92d9d7a34de9fe017b7082b5958bb93 ("Input: samsung-keypad - Add
> samsung keypad driver") from the input tree.
> 
> This just looks like two versions of the same driver (or two drivers
> sharing the same header) - please sort this out.  I have fixed up the
> header for today (by including both versions where necessary).

I got this again (something obviously changed a little) but the input
tree version is now in Linus' tree.  Please fix this up.
-- 
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 input tree with the s5p tree

[Kukjin Kim]

Stephen Rothwell wrote:
> 
> Hi all,
> 
> On Thu, 22 Jul 2010 11:46:55 +1000 Stephen Rothwell <sfr@canb.auug.org.au>
> wrote:
> >
> > Today's linux-next merge of the input tree got a conflict in
> > arch/arm/plat-samsung/include/plat/keypad.h between commit
> > 1e3241300503df18a098dd35098f6975dcf622e2 ("ARM: SAMSUNG: Add keypad
> > device support") from the s5p tree and commit
> > 0fffed27f92d9d7a34de9fe017b7082b5958bb93 ("Input: samsung-keypad - Add
> > samsung keypad driver") from the input tree.
> >
> > This just looks like two versions of the same driver (or two drivers
> > sharing the same header) - please sort this out.  I have fixed up the
> > header for today (by including both versions where necessary).
> 
> I got this again (something obviously changed a little) but the input
> tree version is now in Linus' tree.  Please fix this up.

Hi Stephen,

Yeah,

I know that Dmitry's 'Input: samsung-keypad...patch' which includes
plat/keypad.h has been merged Linus' tree in this merge window.
And Joonyoung's another patch which is in my tree needs to update it, but my
tree is don't having it against Linus' 2.6.35.

So happened conflict...how can/should I handle this...
Should I rebase my tree against Linus' latest?

Thanks.

Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.

Re: linux-next: manual merge of the input tree with the s5p tree

[Stephen Rothwell]

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

Hi,

On Fri, 06 Aug 2010 09:43:34 +0900 Kukjin Kim <kgene.kim@samsung.com> wrote:
>
> I know that Dmitry's 'Input: samsung-keypad...patch' which includes
> plat/keypad.h has been merged Linus' tree in this merge window.
> And Joonyoung's another patch which is in my tree needs to update it, but my
> tree is don't having it against Linus' 2.6.35.
> 
> So happened conflict...how can/should I handle this...
> Should I rebase my tree against Linus' latest?

Either rebase (worst), or just merge Linus' tree (better) into yours or
(best) merge what Dmitry merged into Linus' tree.  To do this last, you
need to merge commit d01d0756f75e7a5b4b43764ad45b83c4340f11d6 from Linus'
tree.  Doing this brings in the minimum amount of extra stuff to your
tree, but allows you to sort out the conflict.

-- 
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 input tree with the s5p tree

[Joonyoung Shim]

On 8/6/2010 10:43 AM, Stephen Rothwell wrote:
> Hi,
> 
> On Fri, 06 Aug 2010 09:43:34 +0900 Kukjin Kim <kgene.kim@samsung.com> wrote:
>> I know that Dmitry's 'Input: samsung-keypad...patch' which includes
>> plat/keypad.h has been merged Linus' tree in this merge window.
>> And Joonyoung's another patch which is in my tree needs to update it, but my
>> tree is don't having it against Linus' 2.6.35.
>>
>> So happened conflict...how can/should I handle this...
>> Should I rebase my tree against Linus' latest?
> 
> Either rebase (worst), or just merge Linus' tree (better) into yours or
> (best) merge what Dmitry merged into Linus' tree.  To do this last, you
> need to merge commit d01d0756f75e7a5b4b43764ad45b83c4340f11d6 from Linus'
> tree.  Doing this brings in the minimum amount of extra stuff to your
> tree, but allows you to sort out the conflict.
> 

Kukjin,

If you rebase and need, i can send updated patches. It uses "ARM:
SAMSUNG: Add helper to clone and set platform data" patch of Ben Dooks.

Thanks.

RE: linux-next: manual merge of the input tree with the s5p tree

[Kukjin Kim]

Joonyoung Shim wrote:
> 
> On 8/6/2010 10:43 AM, Stephen Rothwell wrote:
> > Hi,
> >
> > On Fri, 06 Aug 2010 09:43:34 +0900 Kukjin Kim <kgene.kim@samsung.com>
> wrote:
> >> I know that Dmitry's 'Input: samsung-keypad...patch' which includes
> >> plat/keypad.h has been merged Linus' tree in this merge window.
> >> And Joonyoung's another patch which is in my tree needs to update it, but my
> >> tree is don't having it against Linus' 2.6.35.
> >>
> >> So happened conflict...how can/should I handle this...
> >> Should I rebase my tree against Linus' latest?
> >
> > Either rebase (worst), or just merge Linus' tree (better) into yours or
> > (best) merge what Dmitry merged into Linus' tree.  To do this last, you
> > need to merge commit d01d0756f75e7a5b4b43764ad45b83c4340f11d6 from
> Linus'
> > tree.  Doing this brings in the minimum amount of extra stuff to your
> > tree, but allows you to sort out the conflict.
> >
> 
> Kukjin,
> 
> If you rebase and need, i can send updated patches. It uses "ARM:
> SAMSUNG: Add helper to clone and set platform data" patch of Ben Dooks.
> 
> Thanks.

Ok...please send it in today.

I have a plan to send 'pull request' to Russell in this weekend or the beginning of next week.

Thanks.

Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.

RE: linux-next: manual merge of the input tree with the s5p tree

[Kukjin Kim]

Stephen Rothwell wrote:
> 
> Hi,
> 
> On Fri, 06 Aug 2010 09:43:34 +0900 Kukjin Kim <kgene.kim@samsung.com>
wrote:
> >
> > I know that Dmitry's 'Input: samsung-keypad...patch' which includes
> > plat/keypad.h has been merged Linus' tree in this merge window.
> > And Joonyoung's another patch which is in my tree needs to update it,
but my
> > tree is don't having it against Linus' 2.6.35.
> >
> > So happened conflict...how can/should I handle this...
> > Should I rebase my tree against Linus' latest?
> 
> Either rebase (worst), or just merge Linus' tree (better) into yours or
> (best) merge what Dmitry merged into Linus' tree.  To do this last, you
> need to merge commit d01d0756f75e7a5b4b43764ad45b83c4340f11d6 from Linus'
> tree.  Doing this brings in the minimum amount of extra stuff to your
> tree, but allows you to sort out the conflict.
> 
Thanks for your kindly reply.

I will merge Dmitry's merge commit that you inform to me in my tree.
Then, conflict may be not happened tomorrow. :-)

Cc'ed Russell...

I wonder...as you know, my tree will going to upstream through Russell's
tree...if his tree doesn't having it, is it no problem when he merges my
tree?
I mean, is it no problem that there are Dmitry's stuff which has been merged
into Linus' in my tree when I'm sending 'pull request' to Russell?

Thanks.

Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.

Re: linux-next: manual merge of the input tree with the s5p tree

[Stephen Rothwell]

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

Hi,

On Fri, 06 Aug 2010 13:33:27 +0900 Kukjin Kim <kgene.kim@samsung.com> wrote:
>
> I will merge Dmitry's merge commit that you inform to me in my tree.
> Then, conflict may be not happened tomorrow. :-)

OK.  Thanks.

> I wonder...as you know, my tree will going to upstream through Russell's
> tree...if his tree doesn't having it, is it no problem when he merges my
> tree?
> I mean, is it no problem that there are Dmitry's stuff which has been merged
> into Linus' in my tree when I'm sending 'pull request' to Russell?

It should cause no problem to Russell or Linus - git is good at ignoring
common subtrees when merging.

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

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