Skip to contentSkip to conversation

FAILED: patch "[PATCH] dt-bindings: i2c: atmel,at91sam: correct path to" failed to apply to 6.1-stable tree

PATCH [email protected] 1 participant 1 message Jun 24, 2024

Subsystems (4)
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 6.1-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

To reproduce the conflict and resubmit, you may use the following commands:

git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y
git checkout FETCH_HEAD
git cherry-pick -x d4e001ffeccfc128c715057e866f301ac9b95728
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2024062426-sleeve-manicure-e52d@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^..

Possible dependencies:

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From d4e001ffeccfc128c715057e866f301ac9b95728 Mon Sep 17 00:00:00 2001
From: Krzysztof Kozlowski <[email protected]>
Date: Thu, 20 Jun 2024 13:34:49 +0200
Subject: [PATCH] dt-bindings: i2c: atmel,at91sam: correct path to
i2c-controller schema

The referenced i2c-controller.yaml schema is provided by dtschema package (outside of Linux kernel), so use full path to reference it.

Fixes 7ea75dd386be ("dt-bindings: i2c: convert i2c-at91 to json-schema")
Documentation/devicetree/bindings/i2c/atmel,at91sam-i2c.yaml +1 -1
index b1c13bab2472..b2d19cfb87ad 100644
@@ -77,7 +77,7 @@ required:
   - clocks
 
 allOf:
-  - $ref: i2c-controller.yaml
+  - $ref: /schemas/i2c/i2c-controller.yaml#
   - if:
       properties:
         compatible: