From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Dmitry Torokhov <dmitry.torokhov@gmail•com>
Cc: David Heidelberg <david@ixit•cz>,
Jesse Taube <mr.bossman075@gmail•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Rob Herring <robh@kernel•org>
Subject: linux-next: manual merge of the input tree with Linus' tree
Date: Thu, 4 Nov 2021 10:21:09 +1100 [thread overview]
Message-ID: <20211104102109.129031fb@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1686 bytes --]
Hi all,
Today's linux-next merge of the input tree got a conflict in:
Documentation/devicetree/bindings/input/cap11xx.txt
between commit:
a8bc0707e134 ("dt-bindings: input: microchip,cap11xx: Convert txt bindings to yaml")
from Linus' tree and commit:
322a552e1955 ("Input: cap11xx - add support for cap1206")
from the input tree.
I fixed it up (I remove the file and adde the following patch) 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.
From: Stephen Rothwell <sfr@canb•auug.org.au>
Date: Thu, 4 Nov 2021 10:18:15 +1100
Subject: [PATCH] Input: cap11xx: fix for "dt-bindings: input:
microchip,cap11xx: Convert txt bindings to yaml"
Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
---
Documentation/devicetree/bindings/input/microchip,cap11xx.yaml | 1 +
1 file changed, 1 insertion(+)
diff --git a/Documentation/devicetree/bindings/input/microchip,cap11xx.yaml b/Documentation/devicetree/bindings/input/microchip,cap11xx.yaml
index fa0f37a90ac9..d5d6bced3148 100644
--- a/Documentation/devicetree/bindings/input/microchip,cap11xx.yaml
+++ b/Documentation/devicetree/bindings/input/microchip,cap11xx.yaml
@@ -19,6 +19,7 @@ properties:
- microchip,cap1106
- microchip,cap1126
- microchip,cap1188
+ - microchip,cap1206
reg:
maxItems: 1
--
2.33.0
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2021-11-03 23:21 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-03 23:21 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-08-20 1:37 linux-next: manual merge of the input tree with Linus' tree Stephen Rothwell
2025-08-21 14:57 ` Miguel Ojeda
2024-08-20 1:23 Stephen Rothwell
2022-01-09 23:53 Stephen Rothwell
2020-07-22 4:49 Stephen Rothwell
2013-11-12 1:58 Stephen Rothwell
2012-03-27 1:16 Stephen Rothwell
2012-03-27 7:33 ` Dmitry Torokhov
2010-12-14 2:26 Stephen Rothwell
2010-12-14 18:40 ` Dmitry Torokhov
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=20211104102109.129031fb@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=david@ixit$(echo .)cz \
--cc=dmitry.torokhov@gmail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mr.bossman075@gmail$(echo .)com \
--cc=robh@kernel$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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