From: Greg Ungerer <gerg@linux-m68k.org>
To: Michael Schmitz <schmitzmic@gmail.com>,
Stephen Rothwell <sfr@canb.auug.org.au>,
Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the m68knommu tree with the m68k tree
Date: Tue, 10 May 2022 14:15:46 +1000 [thread overview]
Message-ID: <798b6222-d21e-d6b7-8cea-afcd536f094f@linux-m68k.org> (raw)
In-Reply-To: <7bcb1248-7329-9aee-5d81-7e846cd1e461@gmail.com>
Hi Michael,
On 10/5/22 13:37, Michael Schmitz wrote:
> Hi Stephen,
>
> apologies on my part - I had thought that I had copied in Greg on my patch series. And I evidently missed that his ELF patch would have clashed with mine.
You definitely did, I still have your patches in my inbox too :-)
> Geert and Greg coordinate well as a rule, and both patches had been seen on the linux-m68k mailing list (just too far apart to jog my memory).
Yeah, this was really an accident of timing between Geert applying your series
to his for-next branch, and me applying the regset changes to my for-next
branch.
The two changes are quite distinct, but they overlap in location within
ptrace.c file. The fixup patch is pretty strait forward, and Stephen has that
right.
Regards
Greg
> Won't happen again this decade (I hope).
>
> Cheers,
>
> Michael
>
>
> Am 10.05.2022 um 11:44 schrieb Stephen Rothwell:
>> Hi all,
>>
>> Today's linux-next merge of the m68knommu tree got a conflict in:
>>
>> arch/m68k/kernel/ptrace.c
>>
>> between commit:
>>
>> c862fe70b023 ("m68k: Wire up syscall_trace_enter/leave for m68k")
>>
>> from the m68k tree and commit:
>>
>> 0d91043d8bdf ("m68knommu: implement minimal regset support")
>>
>> from the m68knommu tree.
>>
>> I fixed it up (see below) and can carry the fix as necessary. This
>> is now fixed as far as linux-next is concerned, but any non trivial
>> conflicts should be mentioned to your upstream maintainer when your tree
>> is submitted for merging. You may also want to consider cooperating
>> with the maintainer of the conflicting tree to minimise any particularly
>> complex conflicts.
>>
next prev parent reply other threads:[~2022-05-10 4:18 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-09 23:44 linux-next: manual merge of the m68knommu tree with the m68k tree Stephen Rothwell
2022-05-10 3:37 ` Michael Schmitz
2022-05-10 4:15 ` Greg Ungerer [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-09-09 23:34 Stephen Rothwell
2020-10-13 7:24 ` Stephen Rothwell
2019-07-01 23:09 Stephen Rothwell
2019-07-09 0:25 ` Stephen Rothwell
2011-11-14 0:03 Stephen Rothwell
2011-11-14 0:29 ` Greg Ungerer
2011-11-09 0:15 Stephen Rothwell
2011-11-09 7:08 ` Greg Ungerer
2011-11-09 7:13 ` Geert Uytterhoeven
2011-11-09 7:37 ` Greg Ungerer
2011-11-09 8:19 ` Geert Uytterhoeven
2011-11-09 0:15 Stephen Rothwell
2011-06-22 1:12 Stephen Rothwell
2011-06-22 6:34 ` Greg Ungerer
2011-06-22 8:29 ` Geert Uytterhoeven
2011-06-23 6:12 ` Greg Ungerer
2010-09-14 0:51 Stephen Rothwell
2010-09-14 1:21 ` Greg Ungerer
2010-09-14 8:47 ` Geert Uytterhoeven
2009-11-26 0:58 Stephen Rothwell
2009-11-26 21:29 ` Geert Uytterhoeven
2009-11-27 4:43 ` Greg Ungerer
2009-11-27 8:43 ` Geert Uytterhoeven
2009-11-27 11:23 ` Greg Ungerer
2009-11-27 21:21 ` Geert Uytterhoeven
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=798b6222-d21e-d6b7-8cea-afcd536f094f@linux-m68k.org \
--to=gerg@linux-m68k.org \
--cc=geert@linux-m68k.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=schmitzmic@gmail.com \
--cc=sfr@canb.auug.org.au \
/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 NNTP newsgroup(s).