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:   Wed, 6 Dec 2017 15:50:04 +0100
From:   Greg KH <>
To:     Stephen Rothwell <>
Cc:     Linux-Next Mailing List <>,
        Linux Kernel Mailing List <>,
        Xingyu Chen <>,
        Jonathan Cameron <>,
        Martin Blumenstingl <>
Subject: Re: linux-next: manual merge of the staging tree with the
 staging.current tree

On Mon, Dec 04, 2017 at 12:50:45PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> Today's linux-next merge of the staging tree got a conflict in:
>   drivers/iio/adc/meson_saradc.c
> between commit:
>   d85eed9f5763 ("iio: adc: meson-saradc: initialize the bandgap correctly on older SoCs")
> from the staging.current tree and commit:
>   930df4d853a8 ("iio: adc: meson-saradc: remove irrelevant clock "sana"")
> 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.

This should now be resolved in my staging-next branch.


greg k-h

Powered by blists - more mailing lists