Hi Kishon, On Tue, 2020-01-14 at 14:01 +0530, Kishon Vijay Abraham I wrote: > 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@xxxxxxxxxxxx> > >>> Acked-by: Rob Herring <robh@xxxxxxxxxx> > >> > >> 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 Sorry, still not reproduce it on your next branch, logs as following: [linux-phy]$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. [linux-phy]$git log --oneline -6 e93d3cf70eee (HEAD -> next) dt-bindings: phy-mtk-tphy: add two optional properties for u2phy 28a263814638 (origin/next) dt-bindings: phy: Add PHY_TYPE_DP definition 56b337ef505d phy: ti: j721e-wiz: Fix return value check in wiz_probe() b66d1ac82918 dt-bindings: usb: Convert Allwinner A80 USB PHY controller to a schema b109c13a533b phy: intel-lgm-emmc: Fix warning by adding missing MODULE_LICENSE c9f9eba06629 phy: ti: j721e-wiz: Manage typec-gpio-dir > > > > 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:? > ? BTW, ? is line break? When I open the patch by vim, and set invlist, line break is $. > > 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
