linux-kernel - linux-next: manual merge of the arc-current tree with Linus' 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-next>] [day] [month] [year] [list]

Message-ID: <20180815081141.3f1b1059@canb.auug.org.au>
Date:   Wed, 15 Aug 2018 08:11:41 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Vineet Gupta <Vineet.Gupta1@...opsys.com>
Cc:     Linux-Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Eugeniy Paltsev <Eugeniy.Paltsev@...opsys.com>,
        Mark Rutland <mark.rutland@....com>,
        Ingo Molnar <mingo@...nel.org>
Subject: linux-next: manual merge of the arc-current tree with Linus' tree

Hi Vineet,

Today's linux-next merge of the arc-current tree got a conflict in:

  arch/arc/include/asm/atomic.h

between commit:

  ab0b910490fe ("atomics/arc: Define atomic64_fetch_add_unless()")

from Linus' tree and commit:

  39456148db74 ("ARC: atomic64: fix atomic64_add_unless function")

from the arc-current tree.

I fixed it up (I just used the version from Linus' tree for now) 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.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped