linux-kernel - linux-next: manual merge of the hid tree with Linus' tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20220422093339.1e0b8033@canb.auug.org.au>
Date:   Fri, 22 Apr 2022 09:33:39 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Jiri Kosina <jikos@...nel.org>,
        Benjamin Tissoires <benjamin.tissoires@...hat.com>
Cc:     Dmitry Torokhov <dmitry.torokhov@...il.com>,
        Jiri Kosina <jkosina@...e.cz>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Pablo Ceballos <pceballos@...gle.com>,
        Stephen Boyd <swboyd@...omium.org>
Subject: linux-next: manual merge of the hid tree with Linus' tree

Hi all,

Today's linux-next merge of the hid tree got conflicts in:

  drivers/hid/Kconfig
  drivers/hid/Makefile

between commit:

  33bbe04a15f2 ("HID: google: extract Vivaldi hid feature mapping for use in hid-hammer")

from Linus' tree and commit:

  e9c8c7c43b51 ("HID: Driver for Google Hangouts Meet Speakermic")

from the hid tree.

I have to wonder why these new VIVALDI bits were not put next to the
old VIVALDI bits ...

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/hid/Kconfig
index a95a7cbc4a59,ef58b5c03780..000000000000
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@@ -405,17 -405,20 +405,29 @@@ config HOLTEK_F
  	  Say Y here if you have a Holtek On Line Grip based game controller
  	  and want to have force feedback support for it.
  
 +config HID_VIVALDI_COMMON
 +	tristate
 +	help
 +	  ChromeOS Vivaldi HID parsing support library. This is a hidden
 +	  option so that drivers can use common code to parse the HID
 +	  descriptors for vivaldi function row keymap.
 +
+ config HID_GOOGLE_ATRUS
+ 	tristate "Google Hangouts Meet Speakermic"
+ 	depends on USB_HID
+ 	help
+ 	This selects a driver for the Google Hangouts Meet Speakermic.
+ 
+ 	This driver works around a problem with the HID usage sent by this
+ 	device for the mute button. It prevents key events from being generated
+ 	for that HID usage since they would be incorrect.
+ 
+ 	Say Y here if you have a Google Hangouts Meet Speakermic.
+ 
  config HID_GOOGLE_HAMMER
  	tristate "Google Hammer Keyboard"
 +	select HID_VIVALDI_COMMON
 +	select INPUT_VIVALDIFMAP
  	depends on USB_HID && LEDS_CLASS && CROS_EC
  	help
  	Say Y here if you have a Google Hammer device.
diff --cc drivers/hid/Makefile
index 345ac5581bd8,495e67ec5d9e..000000000000
--- a/drivers/hid/Makefile
+++ b/drivers/hid/Makefile
@@@ -50,7 -50,7 +50,8 @@@ obj-$(CONFIG_HID_FT260)		+= hid-ft260.
  obj-$(CONFIG_HID_GEMBIRD)	+= hid-gembird.o
  obj-$(CONFIG_HID_GFRM)		+= hid-gfrm.o
  obj-$(CONFIG_HID_GLORIOUS)  += hid-glorious.o
 +obj-$(CONFIG_HID_VIVALDI_COMMON) += hid-vivaldi-common.o
+ obj-$(CONFIG_HID_GOOGLE_ATRUS)  += hid-google-atrus.o
  obj-$(CONFIG_HID_GOOGLE_HAMMER)	+= hid-google-hammer.o
  obj-$(CONFIG_HID_VIVALDI)	+= hid-vivaldi.o
  obj-$(CONFIG_HID_GT683R)	+= hid-gt683r.o

Content of type "application/pgp-signature" skipped