From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Andrew Morton <akpm@linux-foundation•org>,
Kees Cook <keescook@chromium•org>
Cc: Linux-Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Manfred Spraul <manfred@colorfullife•com>
Subject: linux-next: manual merge of the akpm-current tree with the kspp tree
Date: Tue, 20 Jun 2017 15:15:49 +1000 [thread overview]
Message-ID: <20170620151549.3380276f@canb.auug.org.au> (raw)
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
include/linux/sem.h
between commit:
1a12979f61e4 ("randstruct: Mark various structs for randomization")
from the kspp tree and commit:
337e62a32a54 ("ipc/sem.c: remove sem_base, embed struct sem")
from the akpm-current 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 include/linux/sem.h
index 23bcbdfad4a6,be5cf2ea14ad..000000000000
--- a/include/linux/sem.h
+++ b/include/linux/sem.h
@@@ -21,7 -39,9 +39,9 @@@ struct sem_array
int sem_nsems; /* no. of semaphores in array */
int complex_count; /* pending complex operations */
unsigned int use_global_lock;/* >0: global lock required */
+
+ struct sem sems[];
-};
+} __randomize_layout;
#ifdef CONFIG_SYSVIPC
next reply other threads:[~2017-06-20 5:15 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-20 5:15 Stephen Rothwell [this message]
2017-07-03 1:31 ` linux-next: manual merge of the akpm-current tree with the kspp tree Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2022-03-03 8:15 Stephen Rothwell
2021-06-25 10:37 Stephen Rothwell
2020-11-25 10:05 Stephen Rothwell
2019-02-13 6:03 Stephen Rothwell
2018-01-15 4:57 Stephen Rothwell
2018-01-15 12:41 ` Arnd Bergmann
2018-01-15 20:07 ` Kees Cook
2017-11-02 8:05 Stephen Rothwell
2017-06-20 5:18 Stephen Rothwell
2017-02-17 4:53 Stephen Rothwell
2016-07-27 6:23 Stephen Rothwell
2016-06-22 4:58 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170620151549.3380276f@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=keescook@chromium$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=manfred@colorfullife$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox