[linux-yocto] : [yocto-4.18]: intel-socfpga: arch: arm64: dts: add altr, sysmgr-syscon property for Ethernet driver

[Bruce Ashfield]

On 2018-11-29 11:49 p.m., Meng.Li at windriver.com wrote:
> From: Limeng <Meng.Li at windriver.com>
> 
> Hi Bruce,
> 
> Could you please help to merge below one patch into linux-yocto, kernel 4.18, branch is v4.18/standard/intel-socfpga

This doesn't apply to the tip of that branch for me:

yow-bashfiel-d4 [/home/bruc...-yocto.git]> git branch | grep \*
* v4.18/standard/intel-socfpga

yow-bashfiel-d4 [/home/bruc...-yocto.git]> git am -s x.mbox
Applying: arch: arm64: dts: add altr,sysmgr-syscon property for Ethernet 
driver
error: patch failed: arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi:368
error: arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi: patch does not 
apply
Patch failed at 0001 arch: arm64: dts: add altr,sysmgr-syscon property 
for Ethernet driver
The copy of the patch that failed is found in:
    /home/bruce/poky-kernel/linux-yocto.git/.git/rebase-apply/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".

Cheers,

Bruce

>   
> 0001-arch-arm64-dts-add-altr-sysmgr-syscon-property-for-E.patch
> 
>   socfpga_stratix10.dtsi |    5 +++++
>   1 file changed, 5 insertions(+)
> 
> thanks,
> Limeng
> 
>