linux-kernel - Re: [GIT PULL] RTC for 5.11

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <CAHk-=wjOamRwdUH6JSBSeT80XEKdzrEDWY59RPnLbAyjPh4nWw@mail.gmail.com>
Date:   Sun, 20 Dec 2020 10:17:43 -0800
From:   Linus Torvalds <torvalds@...ux-foundation.org>
To:     Alexandre Belloni <alexandre.belloni@...tlin.com>
Cc:     linux-rtc@...r.kernel.org,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>
Subject: Re: [GIT PULL] RTC for 5.11

On Sat, Dec 19, 2020 at 2:12 PM Alexandre Belloni
<alexandre.belloni@...tlin.com> 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 one side of the change involved code
movement, so the conflict diff ended up being big.

But it wasn't actually a bad conflict - I spent more time looking for
that "non trivial" part you warned about than I spent on the conflict
itself ;)

                  Linus