Hi all, [forgot the conflict resolution ...] On Thu, 2 Aug 2018 09:27:20 +1000 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> 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. -- Cheers, Stephen Rothwell diff --cc arch/m68k/mac/misc.c index 19e9d8eef1f2,28090a44fa09..3534aa6a4dc2 --- 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;
Attachment:
pgp0eySoQHl3j.pgp
Description: OpenPGP digital signature