From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 27 Oct 2018 16:24:24 +0000 (-0700)
Subject: Merge tag 'rtc-4.20' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux
X-Git-Tag: v5.15~7716
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c7b7eefa57ae3c8802fdec7d07ac4df6c49d1e7a;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'rtc-4.20' of git://git./linux/kernel/git/abelloni/linux

Pull RTC updates from Alexandre Belloni:
 "This cycle, there were mostly non urgent fixes in drivers. I also
  finally unexported the non managed registration.

  Subsystem:

   - non devm managed registration is now removed from the driver API

   - all the unnecessary rtc_valid_tm() calls have been removed

  Drivers:

   - abx80X: watchdog support

   - cmos: fix non ACPI support

   - sc27xx: fix alarm support

   - Remove a possible sysfs race condition for ab8500, ds1307, ds1685,
     isl1208

   - Fix a possible race condition where an irq handler may be called
     before the rtc_device struct is allocated for mt6397, pl030,
     menelaus, armada38x"

* tag 'rtc-4.20' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux: (54 commits)
  rtc: sc27xx: Always read normal alarm when registering RTC device
  rtc: sc27xx: Add check to see if need to enable the alarm interrupt
  rtc: sc27xx: Remove interrupts disable and clear in probe()
  rtc: sc27xx: Clear SPG value update interrupt status
  rtc: sc27xx: Set wakeup capability before registering rtc device
  rtc: s35390a: Change buf's type to u8 in s35390a_init
  rtc: ds1307: fix ds1339 wakealarm support
  rtc: ds1685: simplify getting .driver_data
  rtc: m41t80: mark expected switch fall-through
  rtc: tegra: Propagate errors from platform_get_irq()
  rtc: cmos: Remove the `use_acpi_alarm' module parameter for !ACPI
  rtc: cmos: Fix non-ACPI undefined reference to `hpet_rtc_interrupt'
  rtc: mv: let the core handle invalid alarms
  rtc: vr41xx: switch to rtc_time64_to_tm/rtc_tm_to_time64
  rtc: ab8500: remove useless check
  rtc: ab8500: let the core handle range
  rtc: ab8500: use rtc_add_group
  rtc: rs5c348: report error when time is invalid
  rtc: rs5c348: remove forward declaration
  rtc: rs5c348: remove useless label
  ...
---

c7b7eefa57ae3c8802fdec7d07ac4df6c49d1e7a
diff --cc arch/mips/Kconfig
index 53e75dd,c695825..80778b4
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@@ -75,10 -75,9 +75,10 @@@ config MIP
  	select MODULES_USE_ELF_RELA if MODULES && 64BIT
  	select MODULES_USE_ELF_REL if MODULES
  	select PERF_USE_VMALLOC
- 	select RTC_LIB if !MACH_LOONGSON64
+ 	select RTC_LIB
  	select SYSCTL_EXCEPTION_TRACE
  	select VIRT_TO_BUS
 +	select NO_BOOTMEM
  
  menu "Machine selection"