linux-kernel - Re: linux-next: manual merge of the staging tree with the v4l-dvb 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: <Y+nhLqlblKqae87H@kroah.com>
Date:   Mon, 13 Feb 2023 08:05:18 +0100
From:   Greg KH <greg@...ah.com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Mauro Carvalho Chehab <mchehab@...nel.org>,
        Christian Gromm <christian.gromm@...rochip.com>,
        Hans Verkuil <hverkuil-cisco@...all.nl>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Parthiban Veerasooran <Parthiban.Veerasooran@...rochip.com>
Subject: Re: linux-next: manual merge of the staging tree with the v4l-dvb
 tree

On Mon, Feb 13, 2023 at 01:13:18PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the staging tree got a conflict in:
> 
>   MAINTAINERS
> 
> between commit:
> 
>   ba47652ba655 ("media: meye: remove this deprecated driver")
> 
> from the v4l-dvb tree and commit:
> 
>   eec8ccab1b57 ("most: add maintainer entry")
> 
> from the staging 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.

Fix up looks good, thanks!

greg k-h