linux-kernel - Re: [GIT PULL for v4.16-rc1] media updates

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: <20180207091643.6b71df0a@canb.auug.org.au>
Date:   Wed, 7 Feb 2018 09:16:43 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Linus Torvalds <torvalds@...ux-foundation.org>
Cc:     Mauro Carvalho Chehab <mchehab@...pensource.com>,
        Andrew Morton <akpm@...ux-foundation.org>,
        Linux Media Mailing List <linux-media@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>
Subject: Re: [GIT PULL for v4.16-rc1] media updates

Hi Linus,

On Tue, 6 Feb 2018 09:11:30 -0200 Mauro Carvalho Chehab <mchehab@...pensource.com> wrote:
>
> 1) You may expect a merge conflict due to this patch:
> 	c23e0cb81e40 ("media: annotate ->poll() instances")
> 
>      See: https://lkml.org/lkml/2018/1/1/547

Looks like you missed this when doing the merge :-(

-- 
Cheers,
Stephen Rothwell