Re: [cip-dev][PATCH 4.4.y-cip 1/2] ARM: DTS: am33xx: Use the new DT bindings for the eDMA3

["Pavel Machek" <pavel@ucw.cz>]

[-- Attachment #1.1: Type: text/plain, Size: 1827 bytes --]

Hi!

> From: Peter Ujfalusi <peter.ujfalusi@ti.com>
> 
> 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?

Thanks and best regards,
								Pavel
-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 181 bytes --]

[-- Attachment #2: Type: text/plain, Size: 419 bytes --]

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.

View/Reply Online (#4727): https://lists.cip-project.org/g/cip-dev/message/4727
Mute This Topic: https://lists.cip-project.org/mt/74689397/4520388
Group Owner: cip-dev+owner@lists.cip-project.org
Unsubscribe: https://lists.cip-project.org/g/cip-dev/leave/8129055/727948398/xyzzy  [cip-dev@archiver.kernel.org]
-=-=-=-=-=-=-=-=-=-=-=-