Re: linux-next: manual merge of the hid tree with the qcom tree

Hi all, On Tue, 19 Jan 2021 10:45:36 +1100 Stephen Rothwell wrote: > > 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: > >

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