Re: linux-next: manual merge of the powerpc tree with the m68k tree

On Thu, 2 Aug 2018, Geert Uytterhoeven wrote: > Hi Stephen, > > On Thu, Aug 2, 2018 at 1:42 AM Stephen Rothwell wrote: > > [forgot the conflict resolution ...] > > > > On Thu, 2 Aug 2018 09:27:20 +1000 Stephen Rothwell > > wrote: > > > > > > Today's linux-next merge of the powerpc tree got a c

Re: linux-next: manual merge of the powerpc tree with the m68k tree

Hi Stephen, On Thu, Aug 2, 2018 at 1:42 AM Stephen Rothwell wrote: > [forgot the conflict resolution ...] > > On Thu, 2 Aug 2018 09:27:20 +1000 Stephen Rothwell > wrote: > > > > Today's linux-next merge of the powerpc tree got a conflict in: > > > > arch/m68k/mac/misc.c > > > > between commit

Re: linux-next: manual merge of the powerpc tree with the m68k tree

Hi all, [forgot the conflict resolution ...] On Thu, 2 Aug 2018 09:27:20 +1000 Stephen Rothwell 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 t

linux-next: manual merge of the powerpc tree with the m68k tree

Hi all, 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 t