linux-kernel - Re: linux-next: manual merge of the v4l-dvb tree with the mvebu 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: <20201204113903.GS852@paasikivi.fi.intel.com>
Date:   Fri, 4 Dec 2020 13:39:03 +0200
From:   Sakari Ailus <sakari.ailus@...ux.intel.com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Mauro Carvalho Chehab <mchehab@...nel.org>,
        Jason Cooper <jason@...edaemon.net>,
        Andrew Lunn <andrew@...n.ch>,
        Gregory Clement <gregory.clement@...tlin.com>,
        ARM <linux-arm-kernel@...ts.infradead.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Luka Kovacic <luka.kovacic@...tura.hr>,
        Mauro Carvalho Chehab <mchehab+huawei@...nel.org>
Subject: Re: linux-next: manual merge of the v4l-dvb tree with the mvebu tree

On Thu, Dec 03, 2020 at 11:51:37AM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the v4l-dvb tree got a conflict in:
> 
>   MAINTAINERS
> 
> between commit:
> 
>   8c4e256e3d42 ("MAINTAINERS: Add an entry for MikroTik CRS3xx 98DX3236 boards")
> 
> from the mvebu tree and commit:
> 
>   b24cc2a18c50 ("media: smiapp: Rename as "ccs"")
> 
> from the v4l-dvb tree.
> 
> I fixed it up (see below) 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.

Thanks, Stephen.

The resolution below seems good to me.

-- 
Sakari Ailus