From: Finn Thain <fthain@telegraphics.com.au>
To: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
Michael Ellerman <mpe@ellerman.id.au>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
linuxppc-dev <linuxppc-dev@lists.ozlabs.org>,
Linux-Next <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Arnd Bergmann <arnd@arndb.de>
Subject: Re: linux-next: manual merge of the powerpc tree with the m68k tree
Date: Sat, 4 Aug 2018 22:25:37 +1000 (AEST) [thread overview]
Message-ID: <alpine.LNX.2.21.1808042209030.9@nippy.intranet> (raw)
In-Reply-To: <CAMuHMdXTW8iSA+HnnDNzoNkMwUchLY1J6YBYCBCfGRT5UatBqg@mail.gmail.com>
On Thu, 2 Aug 2018, Geert Uytterhoeven wrote:
> Hi Stephen,
>
> On Thu, Aug 2, 2018 at 1:42 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > [forgot the conflict resolution ...]
> >
> > On Thu, 2 Aug 2018 09:27:20 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > >
> > > Today's linux-next merge of the powerpc tree got a conflict in:
> > >
> > > arch/m68k/mac/misc.c
> > >
> > > between commit:
> > >
> > > 5b9bfb8ec467 ("m68k: mac: Use time64_t in RTC handling")
> > >
> > > from the m68k tree and commit:
> > >
> > > ebd722275f9c ("macintosh/via-pmu: Replace via-pmu68k driver with via-pmu driver")
> > >
> > > from the powerpc 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.
>
> Ah, now I remember Finn said he was going to rebase his series once the
> time64_t patch has entered my tree...
>
The conflict I was worried about was avoided when I dropped v3 patch 10/12
("macintosh: Use common code to access RTC"). I'll rework that patch after
all the PMU and RTC work makes its way into Linus' tree.
> > --- a/arch/m68k/mac/misc.c
> > +++ b/arch/m68k/mac/misc.c
> > @@@ -90,11 -85,11 +90,11 @@@ static void cuda_write_pram(int offset
> > }
> > #endif /* CONFIG_ADB_CUDA */
> >
> > - #ifdef CONFIG_ADB_PMU68K
> > + #ifdef CONFIG_ADB_PMU
> > -static long pmu_read_time(void)
> > +static time64_t pmu_read_time(void)
> > {
> > struct adb_request req;
> > - long time;
> > + time64_t time;
> >
> > if (pmu_request(&req, NULL, 1, PMU_READ_RTC) < 0)
> > return 0;
>
> Thanks, looks good to me!
>
Looks good to me, too.
Thanks.
--
> Gr{oetje,eeting}s,
>
> Geert
>
>
prev parent reply other threads:[~2018-08-04 12:25 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-01 23:27 linux-next: manual merge of the powerpc tree with the m68k tree Stephen Rothwell
2018-08-01 23:41 ` Stephen Rothwell
2018-08-02 7:17 ` Geert Uytterhoeven
2018-08-04 12:25 ` Finn Thain [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=alpine.LNX.2.21.1808042209030.9@nippy.intranet \
--to=fthain@telegraphics.com.au \
--cc=arnd@arndb.de \
--cc=benh@kernel.crashing.org \
--cc=geert@linux-m68k.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mpe@ellerman.id.au \
--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).