linux-kernel - Re: [PULL REQUEST] i2c for 4.16

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] [day] [month] [year] [list]

Message-ID: <CA+55aFznKWoq3bbGMqKLSCj1Kv_aPQ7G+ojYajhiH+vxYH4BJA@mail.gmail.com>
Date:   Sun, 4 Feb 2018 11:10:45 -0800
From:   Linus Torvalds <torvalds@...ux-foundation.org>
To:     Wolfram Sang <wsa@...-dreams.de>
Cc:     linux-i2c@...r.kernel.org,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Peter Rosin <peda@...ntia.se>,
        Bartosz Golaszewski <brgl@...ev.pl>
Subject: Re: [PULL REQUEST] i2c for 4.16

On Sat, Feb 3, 2018 at 2:30 PM, Wolfram Sang <wsa@...-dreams.de> wrote:
>
> There was a small merge conflict in MAINTAINERS in linux-next, but that
> should be easy to fix.

Well, that one wouldn't have happened at all if the i2c people knew
how to sort things..

It also grew a few other conflicts since linux-next, but hopefully I
got those right too.

              Linus