linux-kernel - Re: linux-next: manual merge of the v4l-dvb tree with Linus' tree

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: <20211001064612.GA1157@gofer.mess.org>
Date:   Fri, 1 Oct 2021 07:46:12 +0100
From:   Sean Young <sean@...s.org>
To:     Mauro Carvalho Chehab <mchehab@...nel.org>
Cc:     Stephen Rothwell <sfr@...b.auug.org.au>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Mauro Carvalho Chehab <mchehab+huawei@...nel.org>
Subject: Re: linux-next: manual merge of the v4l-dvb tree with Linus' tree

Hi Mauro,

On Fri, Oct 01, 2021 at 10:33:23AM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the v4l-dvb tree got a conflict in:
> 
>   drivers/media/rc/ir_toy.c
> 
> between commit:
> 
>   f0c15b360fb6 ("media: ir_toy: prevent device from hanging during transmit")
> 
> from Linus' tree and commit:
> 
>   4114978dcd24 ("media: ir_toy: prevent device from hanging during transmit")
> 
> from the v4l-dvb tree.
> 
> I fixed it up (I just used the latter) and can carry the fix as
> necessary. This is now fixed as far as linux-next is concerned, but any
> non trivial conflicts should be mentioned to your upstream maintainer
> when your tree is submitted for merging.  You may also want to consider
> cooperating with the maintainer of the conflicting tree to minimise any
> particularly complex conflicts.

Like I said on irc, this needs fixing up. You've changed a commit which is
already upstream.

Thanks,

Sean