On Thu, Feb 25, 2021 at 09:40:58PM -0600, Peter Bergner wrote: > On 2/25/21 7:09 PM, Segher Boessenkool wrote: > > On Thu, Feb 25, 2021 at 07:05:26PM -0600, Peter Bergner wrote: > >> The compat builtin patch was approved for backporting to GCC10, so we'll > >> need this fix to go along with it. > > > > Okay for that as well of course. > > Thanks, I'll give this a day or two and then push the two to gcc10. > Do you want them committed separately or squashed into one commit > since the 2nd patch fixes the issue in the first patch?
Traditionally, we do one commit for such backports, with the original commit messages in it. I do not know how well this works with the server-side changelog stuff. Maybe you can cherry-pick (with -x) and squash the two patches? It isn't a super big problem if you backport the possible bisect break as well (in reality, will it ever be an issue for anyone?), but it is better to avoid it of course. Segher
