Hi, > -----Original Message----- > From: Pavel Machek [mailto:pavel@denx.de] > Sent: Saturday, June 6, 2020 6:18 AM > To: Johnson CH Chen (陳昭勳) > Cc: iwamatsu nobuhiro(岩松 信洋 □SWC◯ACT) ; pavel@denx.de; > cip-dev@lists.cip-project.org > Subject: Re: [cip-dev][PATCH 4.4.y-cip 1/2] ARM: DTS: am33xx: Use the new DT bindings for the eDMA3 > > Hi! > > > From: Peter Ujfalusi > > > > commit b5e5090660742c838ddc0b5d1a001e6fe3d5bfd5 upstream. > > I get quite a lot of complains here, if I try to apply patch > automatically using git-am. > > Applying: ARM: DTS: am33xx: Use the new DT bindings for the eDMA3 > .git/rebase-apply/patch:17: trailing whitespace. > dmas = <&edma_xbar 12 0 1 > .git/rebase-apply/patch:18: trailing whitespace. > &edma_xbar 13 0 2>; > .git/rebase-apply/patch:58: trailing whitespace. > dmas = <&edma_xbar 12 0 1 > .git/rebase-apply/patch:59: trailing whitespace. > &edma_xbar 13 0 2>; > .git/rebase-apply/patch:71: trailing whitespace. > edma_xbar: dma-router@f90 { > error: patch failed: arch/arm/boot/dts/am335x-evm.dts:743 > error: arch/arm/boot/dts/am335x-evm.dts: patch does not apply > error: patch failed: arch/arm/boot/dts/am335x-pepper.dts:339 > error: arch/arm/boot/dts/am335x-pepper.dts: patch does not apply > error: patch failed: arch/arm/boot/dts/am33xx.dtsi:162 > error: arch/arm/boot/dts/am33xx.dtsi: patch does not apply > Patch failed at 0001 ARM: DTS: am33xx: Use the new DT bindings for the eDMA3 > The copy of the patch that failed is found in: .git/rebase-apply/patch > When you have resolved this problem, run "git am --continue". > > And it seems to me problem is in CR/LF line endings in the patch: > > pavel@amd:~/cip/k$ file .git/rebase-apply/patch > .git/rebase-apply/patch: unified diff output, ASCII text, with CRLF > line terminators > > I believe I could somehow convince git to apply it, anyway; or maybe > to cherry-pick commits from mainline, but... Could I ask for a patch > series that can be applied using git am? I got patches from patchwork, I could apply. The line ending code of the patch obtained from patchwork was LF. So, I applied and push these patches. Best regards, Nobuhiro