[PATCH] Patch attempt two to avoid nameclash of PAGESIZE define

[Robin Müller]

Can you try

git apply --reject --whitespace=fix mychanges.patch

taken from
https://stackoverflow.com/questions/4770177/git-patch-does-not-apply .
This worked for me

Kind Regards
Robin

On Fri, 23 Apr 2021 at 12:32, Robin Müller <robin.mueller.m at gmail.com>
wrote:

> Can you try
>
> git apply --reject --whitespace=fix mychanges.patch
>
> taken from
> https://stackoverflow.com/questions/4770177/git-patch-does-not-apply .
> This worked for me
>
> Kind Regards
> Robin
>
> On Fri, 23 Apr 2021 at 11:42, Sebastian Huber <
> sebastian.huber at embedded-brains.de> wrote:
>
>> On 21/04/2021 10:55, Robin Mueller wrote:
>>
>> > This commit excludes the PAGESIZE legacy define
>> > because there is a nameclash with a define of the same name
>> > coming from the RTEMS header limits.h.
>>
>> I am still not able to apply this patch.
>>
>> git am \[PATCH\]\ Patch\ attempt\ two\ to\ avoid\ nameclash\ of\
>> PAGESIZE\ define.eml
>> Applying: Patch attempt two to avoid nameclash of PAGESIZE define
>> error: patch failed: bsps/arm/stm32h7/include/Legacy/stm32_hal_legacy.h:31
>> error: bsps/arm/stm32h7/include/Legacy/stm32_hal_legacy.h: patch does
>> not apply
>> Patch failed at 0001 Patch attempt two to avoid nameclash of PAGESIZE
>> define
>> hint: Use 'git am --show-current-patch=diff' 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".
>>
>> Maybe send the patch as an attachment.
>>
>> --
>> embedded brains GmbH
>> Herr Sebastian HUBER
>> Dornierstr. 4
>> 82178 Puchheim
>> Germany
>> email: sebastian.huber at embedded-brains.de
>> phone: +49-89-18 94 741 - 16
>> fax:   +49-89-18 94 741 - 08
>>
>> Registergericht: Amtsgericht München
>> Registernummer: HRB 157899
>> Vertretungsberechtigte Geschäftsführer: Peter Rasmussen, Thomas Dörfler
>> Unsere Datenschutzerklärung finden Sie hier:
>> https://embedded-brains.de/datenschutzerklaerung/
>>
>>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.rtems.org/pipermail/devel/attachments/20210423/097f188c/attachment.html>