From: Szabolcs Nagy <szabolcs.nagy@arm.com>
To: Wilco Dijkstra <Wilco.Dijkstra@arm.com>
Cc: Carlos O'Donell <carlos@redhat.com>,
'GNU C Library' <libc-alpha@sourceware.org>,
DJ Delorie <dj@redhat.com>
Subject: Re: [PATCH v4] Remove catomics
Date: Tue, 18 Oct 2022 14:34:59 +0100 [thread overview]
Message-ID: <Y06rg5fg8IDRihbA@arm.com> (raw)
In-Reply-To: <AS4PR08MB7901DA3D9A3F3CFA5A2E233B83289@AS4PR08MB7901.eurprd08.prod.outlook.com>
The 10/18/2022 13:01, Wilco Dijkstra via Libc-alpha wrote:
> Hi Carlos,
>
> >> It works fine for me - the patch merges using patch -p 1 -i <patchfile>.
> >> What settings do you use in the CI?
> >
> > git apply -p1
> >
> > https://gitlab.com/djdelorie/glibc-cicd/-/blob/main/trybot-apply_patch.py#L65
>
> Right, it seems that is not compatible with the default settings of 'patch'. In general
> for CI you want to try to match automatically whenever feasible rather than only
> accept perfect matching patches. This is even true for auto-commit CI since you'd
> only commit after build&test passes.
>
> How about adding '-C1' which allows for a reduced context?
i think it is expected that there is no conflict with whatever is in
current master, which works if you rebase your patch before posting.
prev parent reply other threads:[~2022-10-18 13:35 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-14 16:38 Wilco Dijkstra
2022-10-17 13:25 ` Carlos O'Donell
2022-10-17 14:50 ` Wilco Dijkstra
2022-10-17 21:56 ` Carlos O'Donell
2022-10-18 13:01 ` Wilco Dijkstra
2022-10-18 13:34 ` Szabolcs Nagy [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Y06rg5fg8IDRihbA@arm.com \
--to=szabolcs.nagy@arm.com \
--cc=Wilco.Dijkstra@arm.com \
--cc=carlos@redhat.com \
--cc=dj@redhat.com \
--cc=libc-alpha@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).