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>] [day] [month] [year] [list]
Message-ID: <20181008114810.6ebbb337@canb.auug.org.au>
Date:   Mon, 8 Oct 2018 11:48:10 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Herbert Xu <herbert@...dor.apana.org.au>,
        Miguel Ojeda <miguel.ojeda.sandonis@...il.com>
Cc:     Linux-Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Kees Cook <keescook@...omium.org>
Subject: linux-next: manual merge of the crypto tree with the
 compiler-attributes tree

Hi all,

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

  include/linux/compiler_types.h

between commit:

  a3f8a30f3f00 ("Compiler Attributes: use feature checks instead of version checks")

from the compiler-attributes tree and commit:

  f3569fd613f6 ("crypto: shash - Remove VLA usage in unaligned hashing")

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

A removed line was moved to a new file, so I have applied the following
merge fix patch from today:

From: Stephen Rothwell <sfr@...b.auug.org.au>
Date: Mon, 8 Oct 2018 11:44:24 +1100
Subject: [PATCH] crypto: fixup for movement of __aligned_largest

Signed-off-by: Stephen Rothwell <sfr@...b.auug.org.au>
---
 include/linux/compiler_attributes.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/include/linux/compiler_attributes.h b/include/linux/compiler_attributes.h
index 6b28c1b7310c..9db94801c780 100644
--- a/include/linux/compiler_attributes.h
+++ b/include/linux/compiler_attributes.h
@@ -49,7 +49,6 @@
  *   gcc: https://gcc.gnu.org/onlinedocs/gcc/Common-Variable-Attributes.html#index-aligned-variable-attribute
  */
 #define __aligned(x)                    __attribute__((__aligned__(x)))
-#define __aligned_largest               __attribute__((__aligned__))
 
 /*
  * Note: users of __always_inline currently do not write "inline" themselves,
-- 
2.18.0

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped

Powered by blists - more mailing lists

Powered by Openwall GNU/*/Linux Powered by OpenVZ