All of lore.kernel.org
 help / color / mirror / Atom feed
From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Thomas Abraham <thomas.abraham@linaro.org>,
	Kukjin Kim <kgene.kim@samsung.com>
Subject: Re: linux-next: manual merge of the input tree with the s5p tree
Date: Thu, 10 Nov 2011 19:41:59 -0800	[thread overview]
Message-ID: <201111101941.59570.dmitry.torokhov@gmail.com> (raw)
In-Reply-To: <20111111131159.848e724c5a9257d0b9f0f0f9@canb.auug.org.au>

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

  reply	other threads:[~2011-11-11  3:41 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-11-11  2:11 linux-next: manual merge of the input tree with the s5p tree Stephen Rothwell
2011-11-11  3:41 ` Dmitry Torokhov [this message]
2011-11-11  5:57   ` Stephen Rothwell
2011-11-15  7:26     ` Kukjin Kim
2011-11-11  8:40   ` Thomas Abraham
  -- strict thread matches above, loose matches on Subject: below --
2011-11-11  2:11 Stephen Rothwell
2011-11-11  3:42 ` Dmitry Torokhov
2010-07-22  1:46 Stephen Rothwell
2010-08-06  0:24 ` Stephen Rothwell
2010-08-06  0:43   ` Kukjin Kim
2010-08-06  1:43     ` Stephen Rothwell
2010-08-06  3:20       ` Joonyoung Shim
2010-08-06  5:15         ` Kukjin Kim
2010-08-06  4:33       ` Kukjin Kim
2010-08-06  5:17         ` Stephen Rothwell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=201111101941.59570.dmitry.torokhov@gmail.com \
    --to=dmitry.torokhov@gmail.com \
    --cc=kgene.kim@samsung.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    --cc=thomas.abraham@linaro.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.