linux-kernel - Re: linux-next: manual merge of the staging tree with the staging.current 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:	Wed, 27 Apr 2016 13:37:35 +0100
From:	Jonathan Cameron <jic23@...23.retrosnub.co.uk>
To:	Stephen Rothwell <sfr@...b.auug.org.au>, Greg KH <greg@...ah.com>
CC:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Gregor Boirie <gregor.boirie@...rot.com>,
	Jonathan Cameron <jic23@...nel.org>,
	Richard Leitner <dev@...l1n.net>
Subject: Re: linux-next: manual merge of the staging tree with the staging.current tree



On 27 April 2016 05:54:00 BST, Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>Hi Greg,
>
>Today's linux-next merge of the staging tree got a conflict in:
>
>  drivers/iio/magnetometer/ak8975.c
>
>between commit:
>
>  05be8d4101d9 ("iio: ak8975: fix maybe-uninitialized warning")
>
>from the staging.current tree and commit:
>
>  97eacb9166f4 ("iio:ak8975: add mounting matrix support")
>
>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.

Hi Stephen,

Sorry, I clearly failed to check my own trees didn't clash before sending the pull to Greg.

Fix looks good, thanks

Jonathan

-- 
Sent from my Android device with K-9 Mail. Please excuse my brevity.