linux-kernel - Re: linux-next: manual merge of the staging tree with the scmi 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]

Date:   Mon, 29 Mar 2021 10:25:34 +0100
From:   Jonathan Cameron <Jonathan.Cameron@...wei.com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
CC:     Greg KH <greg@...ah.com>, Sudeep Holla <sudeep.holla@....com>,
        "Cristian Marussi" <cristian.marussi@....com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: manual merge of the staging tree with the scmi tree

On Mon, 29 Mar 2021 16:37:00 +1100
Stephen Rothwell <sfr@...b.auug.org.au> wrote:

> Hi all,
> 
> Today's linux-next merge of the staging tree got a conflict in:
> 
>   drivers/iio/common/scmi_sensors/scmi_iio.c
> 
> between commit:
> 
>   fc91d6b6f0ba ("iio/scmi: port driver to the new scmi_sensor_proto_ops interface")
> 
> from the scmi tree and commit:
> 
>   1b33dfa5d5f1 ("Merge remote-tracking branch 'local/ib-iio-scmi-5.12-rc2-take3' into togreg")
> 
> 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.
>

Thanks Stephen,

Looks right. I'll check the overall result once your tree is public.

Jonathan