* linux-next: manual merge of the input tree with the input-current tree
@ 2017-02-09 2:06 Stephen Rothwell
0 siblings, 0 replies; 5+ messages in thread
From: Stephen Rothwell @ 2017-02-09 2:06 UTC (permalink / raw)
To: Dmitry Torokhov; +Cc: linux-next, linux-kernel, Arnd Bergmann
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)"
^ permalink raw reply [flat|nested] 5+ messages in thread
* linux-next: manual merge of the input tree with the input-current tree
@ 2015-03-17 2:27 Stephen Rothwell
0 siblings, 0 replies; 5+ messages in thread
From: Stephen Rothwell @ 2015-03-17 2:27 UTC (permalink / raw)
To: Dmitry Torokhov; +Cc: linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 1338 bytes --]
Hi Dmitry,
Today's linux-next merge of the input tree got a conflict in
drivers/input/mouse/synaptics.c between commit dc5465dc8a6d ("Input:
synaptics - fix middle button on Lenovo 2015 products") from the
input-current tree and commit de4e374b401a ("Input: synaptics - switch
ForcePad detection to PNP IDs") from the input 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 drivers/input/mouse/synaptics.c
index dda605836546,4c69e3304011..000000000000
--- a/drivers/input/mouse/synaptics.c
+++ b/drivers/input/mouse/synaptics.c
@@@ -670,20 -612,6 +677,18 @@@ static void synaptics_parse_agm(const u
}
}
+static void synaptics_parse_ext_buttons(const unsigned char buf[],
+ struct synaptics_data *priv,
+ struct synaptics_hw_state *hw)
+{
+ unsigned int ext_bits =
+ (SYN_CAP_MULTI_BUTTON_NO(priv->ext_cap) + 1) >> 1;
+ unsigned int ext_mask = GENMASK(ext_bits - 1, 0);
+
+ hw->ext_buttons = buf[4] & ext_mask;
+ hw->ext_buttons |= (buf[5] & ext_mask) << ext_bits;
+}
+
- static bool is_forcepad;
-
static int synaptics_parse_hw_state(const unsigned char buf[],
struct synaptics_data *priv,
struct synaptics_hw_state *hw)
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: linux-next: manual merge of the input tree with the input-current tree
2010-09-02 2:46 ` Dmitry Torokhov
@ 2010-09-02 4:00 ` Stephen Rothwell
0 siblings, 0 replies; 5+ messages in thread
From: Stephen Rothwell @ 2010-09-02 4:00 UTC (permalink / raw)
To: Dmitry Torokhov; +Cc: linux-next, linux-kernel, Kevin Wells
[-- Attachment #1: Type: text/plain, Size: 545 bytes --]
Hi Dmitry,
On Wed, 1 Sep 2010 19:46:17 -0700 Dmitry Torokhov <dmitry.torokhov@gmail.com> wrote:
>
> Doh! I did not mean to put mrst changes into 'for-linus'. It is too late
> to re-fetch, isn't it?
It is too late for next-20100902, but if you haven't asked Linus to pull
your tree, just remove it again (I will just fetch and merge whatever you
have in your tree tomorrow). (In any case, he is not pulling stuff this
week.)
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: linux-next: manual merge of the input tree with the input-current tree
2010-09-02 1:59 Stephen Rothwell
@ 2010-09-02 2:46 ` Dmitry Torokhov
2010-09-02 4:00 ` Stephen Rothwell
0 siblings, 1 reply; 5+ messages in thread
From: Dmitry Torokhov @ 2010-09-02 2:46 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Kevin Wells
On Thu, Sep 02, 2010 at 11:59:58AM +1000, Stephen Rothwell wrote:
> Hi Dmitry,
>
> Today's linux-next merge of the input tree got a conflict in
> drivers/input/touchscreen/Makefile between commit
> 948e90e22f01287302d84b5b8d4ba330a41dbf8a ("Input: mrst-touchscreen - move
> out of staging") from the input-current tree and commit
> 3045a5f5202a1e0ab6ba2bf90a786cf4cae6932a ("Input: add LPC32xx touchscreen
> controller driver") from the input tree.
>
> Just overlapping additions. I fixed it up (see below) and can carry the
> fix for a while.
Doh! I did not mean to put mrst changes into 'for-linus'. It is too late
to re-fetch, isn't it?
--
Dmitry
^ permalink raw reply [flat|nested] 5+ messages in thread
* linux-next: manual merge of the input tree with the input-current tree
@ 2010-09-02 1:59 Stephen Rothwell
2010-09-02 2:46 ` Dmitry Torokhov
0 siblings, 1 reply; 5+ messages in thread
From: Stephen Rothwell @ 2010-09-02 1:59 UTC (permalink / raw)
To: Dmitry Torokhov; +Cc: linux-next, linux-kernel, Kevin Wells
Hi Dmitry,
Today's linux-next merge of the input tree got a conflict in
drivers/input/touchscreen/Makefile between commit
948e90e22f01287302d84b5b8d4ba330a41dbf8a ("Input: mrst-touchscreen - move
out of staging") from the input-current tree and commit
3045a5f5202a1e0ab6ba2bf90a786cf4cae6932a ("Input: add LPC32xx touchscreen
controller driver") from the input tree.
Just overlapping additions. 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/input/touchscreen/Makefile
index 9061042,22e2d59..0000000
--- a/drivers/input/touchscreen/Makefile
+++ b/drivers/input/touchscreen/Makefile
@@@ -23,7 -23,7 +23,8 @@@ obj-$(CONFIG_TOUCHSCREEN_EETI) += eeti
obj-$(CONFIG_TOUCHSCREEN_ELO) += elo.o
obj-$(CONFIG_TOUCHSCREEN_FUJITSU) += fujitsu_ts.o
obj-$(CONFIG_TOUCHSCREEN_INEXIO) += inexio.o
+obj-$(CONFIG_TOUCHSCREEN_INTEL_MID) += intel-mid-touch.o
+ obj-$(CONFIG_TOUCHSCREEN_LPC32XX) += lpc32xx_ts.o
obj-$(CONFIG_TOUCHSCREEN_MC13783) += mc13783_ts.o
obj-$(CONFIG_TOUCHSCREEN_MCS5000) += mcs5000_ts.o
obj-$(CONFIG_TOUCHSCREEN_MIGOR) += migor_ts.o
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2017-02-09 2:24 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-02-09 2:06 linux-next: manual merge of the input tree with the input-current tree Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2015-03-17 2:27 Stephen Rothwell
2010-09-02 1:59 Stephen Rothwell
2010-09-02 2:46 ` Dmitry Torokhov
2010-09-02 4:00 ` Stephen Rothwell
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).