linux-kernel - linux-next: manual merge of the seccomp tree with the csky 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 for Android: free password hash cracker in your pocket

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20201125173824.0e3dbcd7@canb.auug.org.au>
Date:   Wed, 25 Nov 2020 17:38:24 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Kees Cook <keescook@...omium.org>, Guo Ren <ren_guo@...ky.com>
Cc:     Guo Ren <guoren@...ux.alibaba.com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        YiFei Zhu <yifeifz2@...inois.edu>
Subject: linux-next: manual merge of the seccomp tree with the csky tree

Hi all,

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

  arch/csky/include/asm/Kbuild

between commit:

  fed76f8679a6 ("csky: Add QUEUED_SPINLOCKS supported")

from the csky tree and commit:

  6e9ae6f98809 ("csky: Enable seccomp architecture tracking")

from the seccomp 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.

-- 
Cheers,
Stephen Rothwell

diff --cc arch/csky/include/asm/Kbuild
index f814d46d347f,93372255984d..000000000000
--- a/arch/csky/include/asm/Kbuild
+++ b/arch/csky/include/asm/Kbuild
@@@ -3,9 -3,6 +3,8 @@@ generic-y += asm-offsets.
  generic-y += gpio.h
  generic-y += kvm_para.h
  generic-y += local64.h
 +generic-y += mcs_spinlock.h
  generic-y += qrwlock.h
 +generic-y += qspinlock.h
- generic-y += seccomp.h
  generic-y += user.h
  generic-y += vmlinux.lds.h

Content of type "application/pgp-signature" skipped