linux-kernel - linux-next: manual merge of the hid tree with the qcom 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>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20210119104536.50e08bac@canb.auug.org.au>
Date:   Tue, 19 Jan 2021 10:45:36 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Jiri Kosina <jikos@...nel.org>,
        Benjamin Tissoires <benjamin.tissoires@...hat.com>,
        Andy Gross <agross@...nel.org>
Cc:     Bjorn Andersson <bjorn.andersson@...aro.org>,
        Douglas Anderson <dianders@...omium.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: linux-next: manual merge of the hid tree with the qcom tree

Hi all,

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

  arch/arm64/configs/defconfig

between commit:

  74b87103b3d0 ("arm64: defconfig: Enable HID multitouch")

from the qcom tree and commit:

  1fe16cfd311b ("arm64: defconfig: Update config names for i2c-hid rejigger")

from the hid 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 arch/arm64/configs/defconfig
index f2107444df08,326198305beb..000000000000
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -756,14 -746,11 +756,15 @@@ CONFIG_SND_SOC_SIMPLE_AMPLIFIER=
  CONFIG_SND_SOC_TAS571X=m
  CONFIG_SND_SOC_WCD934X=m
  CONFIG_SND_SOC_WM8904=m
 +CONFIG_SND_SOC_WM8962=m
  CONFIG_SND_SOC_WSA881X=m
 +CONFIG_SND_SOC_LPASS_WSA_MACRO=m
 +CONFIG_SND_SOC_LPASS_VA_MACRO=m
  CONFIG_SND_SIMPLE_CARD=m
  CONFIG_SND_AUDIO_GRAPH_CARD=m
 +CONFIG_HID_MULTITOUCH=m
- CONFIG_I2C_HID=m
+ CONFIG_I2C_HID_ACPI=m
+ CONFIG_I2C_HID_OF=m
  CONFIG_USB_CONN_GPIO=m
  CONFIG_USB=y
  CONFIG_USB_OTG=y

Content of type "application/pgp-signature" skipped