| Message ID | 20220531221954.160036-1-nfraprado@collabora.com (mailing list archive) |
|---|---|
| Headers | show |
| Series | MT8192 pinctrl properties adjustments | expand |
On Wed, Jun 1, 2022 at 12:19 AM Nícolas F. R. A. Prado <nfraprado@collabora.com> wrote: > The two patches in this series substitute properties in the mt8192 > pinctrl dt-binding for ones which have a clearer meaning and are more > standardized. At this point there's no DT using the mt8192 pinctrl > binding, so if such changes are to be made, they need to happen now. > > v1: https://lore.kernel.org/linux-mediatek/20220525155714.1837360-1-nfraprado@collabora.com/ > > Changes in v2: > - Dropped Fixes tags > - Added 'if' blocks to enforce mutual exclusion of properties This does not apply on the current pinctrl devel branch: https://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git/log/?h=devel Could you please rebase onto my branch and resend as v3? Yours, Linus Walleij
On Wed, Jun 15, 2022 at 03:31:00PM +0200, Linus Walleij wrote: > On Wed, Jun 1, 2022 at 12:19 AM Nícolas F. R. A. Prado > <nfraprado@collabora.com> wrote: > > > The two patches in this series substitute properties in the mt8192 > > pinctrl dt-binding for ones which have a clearer meaning and are more > > standardized. At this point there's no DT using the mt8192 pinctrl > > binding, so if such changes are to be made, they need to happen now. > > > > v1: https://lore.kernel.org/linux-mediatek/20220525155714.1837360-1-nfraprado@collabora.com/ > > > > Changes in v2: > > - Dropped Fixes tags > > - Added 'if' blocks to enforce mutual exclusion of properties > > This does not apply on the current pinctrl devel branch: > https://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git/log/?h=devel > > Could you please rebase onto my branch and resend as v3? Hi Linus, I checked out your branch locally and was able to apply the patch cleanly. Maybe you haven't pushed out all your local changes to that branch yet? Otherwise let me know and I'll send a rebased v3 to see if it helps in some way. Thanks, Nícolas > > Yours, > Linus Walleij
On Wed, Jun 15, 2022 at 10:23:55AM -0400, Nícolas F. R. A. Prado wrote: > On Wed, Jun 15, 2022 at 03:31:00PM +0200, Linus Walleij wrote: > > On Wed, Jun 1, 2022 at 12:19 AM Nícolas F. R. A. Prado > > <nfraprado@collabora.com> wrote: > > > > > The two patches in this series substitute properties in the mt8192 > > > pinctrl dt-binding for ones which have a clearer meaning and are more > > > standardized. At this point there's no DT using the mt8192 pinctrl > > > binding, so if such changes are to be made, they need to happen now. > > > > > > v1: https://lore.kernel.org/linux-mediatek/20220525155714.1837360-1-nfraprado@collabora.com/ > > > > > > Changes in v2: > > > - Dropped Fixes tags > > > - Added 'if' blocks to enforce mutual exclusion of properties > > > > This does not apply on the current pinctrl devel branch: > > https://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git/log/?h=devel > > > > Could you please rebase onto my branch and resend as v3? > > Hi Linus, > > I checked out your branch locally and was able to apply the patch cleanly. Maybe > you haven't pushed out all your local changes to that branch yet? Otherwise let > me know and I'll send a rebased v3 to see if it helps in some way. Actually, I just noticed that you applied 2/2 from v1, maybe that's the reason this v2 series isn't applying? > > Thanks, > Nícolas > > > > > Yours, > > Linus Walleij
On Wed, Jun 15, 2022 at 4:23 PM Nícolas F. R. A. Prado <nfraprado@collabora.com> wrote: > On Wed, Jun 15, 2022 at 03:31:00PM +0200, Linus Walleij wrote: > > On Wed, Jun 1, 2022 at 12:19 AM Nícolas F. R. A. Prado > > <nfraprado@collabora.com> wrote: > > > > > The two patches in this series substitute properties in the mt8192 > > > pinctrl dt-binding for ones which have a clearer meaning and are more > > > standardized. At this point there's no DT using the mt8192 pinctrl > > > binding, so if such changes are to be made, they need to happen now. > > > > > > v1: https://lore.kernel.org/linux-mediatek/20220525155714.1837360-1-nfraprado@collabora.com/ > > > > > > Changes in v2: > > > - Dropped Fixes tags > > > - Added 'if' blocks to enforce mutual exclusion of properties > > > > This does not apply on the current pinctrl devel branch: > > https://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git/log/?h=devel > > > > Could you please rebase onto my branch and resend as v3? > > Hi Linus, > > I checked out your branch locally and was able to apply the patch cleanly. Maybe > you haven't pushed out all your local changes to that branch yet? Otherwise let > me know and I'll send a rebased v3 to see if it helps in some way. Doing this: [linus@fedora linux-pinctrl]$ b4 am -t -S 20220531221954.160036-1-nfraprado@collabora.com Analyzing 8 messages in the thread Checking attestation on all messages, may take a moment... --- ✓ [PATCH v2 1/2] dt-bindings: pinctrl: mt8192: Switch drive-strength-adv for -microamp ✓ [PATCH v2 2/2] dt-bindings: pinctrl: mt8192: Use generic bias instead of pull-*-adv --- ✓ Signed: DKIM/collabora.com --- Total patches: 2 --- Cover: ./v2_20220531_nfraprado_mt8192_pinctrl_properties_adjustments.cover Link: https://lore.kernel.org/r/20220531221954.160036-1-nfraprado@collabora.com Base: not specified git am ./v2_20220531_nfraprado_mt8192_pinctrl_properties_adjustments.mbx [linus@fedora linux-pinctrl]$ git am --signoff ./v2_20220531_nfraprado_mt8192_pinctrl_properties_adjustments.mbx Applying: dt-bindings: pinctrl: mt8192: Switch drive-strength-adv for -microamp error: patch failed: Documentation/devicetree/bindings/pinctrl/pinctrl-mt8192.yaml:80 error: Documentation/devicetree/bindings/pinctrl/pinctrl-mt8192.yaml: patch does not apply Patch failed at 0001 dt-bindings: pinctrl: mt8192: Switch drive-strength-adv for -microamp hint: Use 'git am --show-current-patch=diff' to see the failed patch When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". Yours, Linus Walleij