linux-next: manual merge of the rtc tree with the tip tree

Hi all, Today's linux-next merge of the rtc tree got a conflict in: include/linux/rtc.h between commit: 33e62e832384 ("ntp, rtc: Move rtc_set_ntp_time() to ntp code") from the tip tree and commit: fdcfd854333b ("rtc: rework rtc_register_device() resource management") from the rtc tree.

linux-next: manual merge of the rtc tree with the tip tree

Hi Alexandre, Today's linux-next merge of the rtc tree got a conflict in: arch/x86/platform/efi/efi_64.c between commit: cc3ae7b0af27 ("x86/platform: Audit and remove any unnecessary uses of module.h") from the tip tree and commit: 5ab788d73832 ("rtc: cmos: move mc146818rtc code out of