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
| ||
|
Date: Tue, 14 Jan 2020 14:01:47 +0530 From: Kishon Vijay Abraham I <kishon@...com> To: Chunfeng Yun <chunfeng.yun@...iatek.com>, Kishon Vijay Abraham I <kishon@...93678ub> CC: Rob Herring <robh+dt@...nel.org>, Mark Rutland <mark.rutland@....com>, Matthias Brugger <matthias.bgg@...il.com>, <linux-arm-kernel@...ts.infradead.org>, <linux-mediatek@...ts.infradead.org>, <linux-kernel@...r.kernel.org>, <devicetree@...r.kernel.org> Subject: Re: [RESEND PATCH v5 01/11] dt-bindings: phy-mtk-tphy: add two optional properties for u2phy Hi Chunfeng, On 14/01/20 1:52 PM, Chunfeng Yun wrote: > Hi Kishon, > > On Fri, 2020-01-10 at 16:40 +0530, Kishon Vijay Abraham I wrote: >> Hi, >> >> On Wed, Jan 08, 2020 at 09:51:56AM +0800, Chunfeng Yun wrote: >>> Add two optional properties, one for tuning J-K voltage by INTR, >>> another for disconnect threshold, both of them are related with >>> connect detection >>> >>> Signed-off-by: Chunfeng Yun <chunfeng.yun@...iatek.com> >>> Acked-by: Rob Herring <robh@...nel.org> >> >> Patch does not apply. I get the following errors >> error: patch failed: Documentation/devicetree/bindings/phy/phy-mtk-tphy.txt:52 >> error: Documentation/devicetree/bindings/phy/phy-mtk-tphy.txt: patch does not apply >> error: Did you hand edit your patch? >> >> Can you send them again in the right format? > I download this patch from https://patchwork.kernel.org/patch/11322505/ > and fetch kernel5.5-rc5, then Please try applying to git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy.git next > > git am --reject > RESEND-v5-01-11-dt-bindings-phy-mtk-tphy-add-two-optional-properties-for-u2phy.patch > Applying: dt-bindings: phy-mtk-tphy: add two optional properties for > u2phy > Checking patch Documentation/devicetree/bindings/phy/phy-mtk-tphy.txt... > Applied patch Documentation/devicetree/bindings/phy/phy-mtk-tphy.txt > cleanly. > > don't reproduce the error you encountered, can you tell me the steps you > apply the patch, thanks git am chunfeng.yun.patch --reject Applying: dt-bindings: phy-mtk-tphy: add two optional properties for u2phy Checking patch Documentation/devicetree/bindings/phy/phy-mtk-tphy.txt... error: while searching for: - mediatek,eye-vrt : u32, the selection of VRT reference voltage? - mediatek,eye-term : u32, the selection of HS_TX TERM reference voltage? - mediatek,bc12 : bool, enable BC12 of u2phy if support it? ? Example:? ? error: patch failed: Documentation/devicetree/bindings/phy/phy-mtk-tphy.txt:52 Applying patch Documentation/devicetree/bindings/phy/phy-mtk-tphy.txt with 1 reject... Rejected hunk #1. Patch failed at 0001 dt-bindings: phy-mtk-tphy: add two optional properties for u2phy Use 'git am --show-current-patch' 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". Thanks Kishon
Powered by blists - more mailing lists