From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Arnd Bergmann <arnd@arndb.de>
Subject: linux-next: manual merge of the input tree with the input-current tree
Date: Thu, 9 Feb 2017 13:06:24 +1100 [thread overview]
Message-ID: <20170209130624.362f2048@canb.auug.org.au> (raw)
Hi Dmitry,
Today's linux-next merge of the input tree got a conflict in:
drivers/input/rmi4/Kconfig
between commit:
413d37326700 ("Input: synaptics-rmi4 - select 'SERIO' when needed")
from the input-current tree and commit:
b29c139a15b6 ("Input: synaptics-rmi4 - use Kconfig "if" to express dependency")
from the input tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc drivers/input/rmi4/Kconfig
index bb7762bf2879,78a78b99ec31..000000000000
--- a/drivers/input/rmi4/Kconfig
+++ b/drivers/input/rmi4/Kconfig
@@@ -40,24 -42,16 +42,21 @@@ config RMI4_SM
called rmi_smbus.
config RMI4_F03
- bool "RMI4 Function 03 (PS2 Guest)"
- depends on RMI4_CORE
- help
- Say Y here if you want to add support for RMI4 function 03.
+ bool "RMI4 Function 03 (PS2 Guest)"
- depends on SERIO=y || RMI4_CORE=SERIO
+ help
+ Say Y here if you want to add support for RMI4 function 03.
- Function 03 provides PS2 guest support for RMI4 devices. This
- includes support for TrackPoints on TouchPads.
+ Function 03 provides PS2 guest support for RMI4 devices. This
+ includes support for TrackPoints on TouchPads.
+config RMI4_F03_SERIO
+ tristate
- depends on RMI4_CORE
+ depends on RMI4_F03
+ default RMI4_CORE
+ select SERIO
+
config RMI4_2D_SENSOR
bool
- depends on RMI4_CORE
config RMI4_F11
bool "RMI4 Function 11 (2D pointing)"
next reply other threads:[~2017-02-09 2:24 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-09 2:06 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2015-03-17 2:27 linux-next: manual merge of the input tree with the input-current tree Stephen Rothwell
2010-09-02 1:59 Stephen Rothwell
2010-09-02 2:46 ` Dmitry Torokhov
2010-09-02 4:00 ` 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=20170209130624.362f2048@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=arnd@arndb.de \
--cc=dmitry.torokhov@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).