Re: [GIT PULL] RTC for 5.11

2020-12-20 Thread pr-tracker-bot
The pull request you sent on Sat, 19 Dec 2020 23:12:54 +0100: > git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git tags/rtc-5.11 has been merged into torvalds/linux.git: https://git.kernel.org/torvalds/c/f4a2f7866faaf89ea1595b136e01fcb336b46aab Thank you! -- Deet-doot-dot, I am

Re: [GIT PULL] RTC for 5.11

2020-12-20 Thread Linus Torvalds
On Sat, Dec 19, 2020 at 2:12 PM Alexandre Belloni wrote: > > Here is the RTC pull request for 5.11. There is a non trivial conflict > with the tip tree in include/linux/rtc.h. Heh. That was actually a trivial one - just changes next to each other, nothing odd. It just looked scary because of

[GIT PULL] RTC for 5.11

2020-12-19 Thread Alexandre Belloni
Hello Linus, Here is the RTC pull request for 5.11. There is a non trivial conflict with the tip tree in include/linux/rtc.h. This is properly solved in linux-next, see: https://lore.kernel.org/linux-next/20201214190704.78b44...@canb.auug.org.au/ The following changes since commit