From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Andrew Morton <akpm@linux-foundation•org>,
Greg KH <greg@kroah•com>, Arnd Bergmann <arnd@arndb•de>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Vitaly Kuznetsov <vkuznets@redhat•com>,
"dyoung@redhat•com" <dyoung@redhat•com>
Subject: linux-next: manual merge of the akpm-current tree with the char-misc tree
Date: Thu, 6 Aug 2015 16:35:52 +1000 [thread overview]
Message-ID: <20150806163552.5eabeba3@canb.auug.org.au> (raw)
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in:
include/linux/kexec.h
between commit:
2b94ed245861 ("kexec: define kexec_in_progress in !CONFIG_KEXEC case")
from the char-misc tree and commit:
3d86985f695b ("kexec: split kexec_load syscall from kexec core code")
from the akpm-current tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc include/linux/kexec.h
index b63218f68c4b,5f193d80a6fb..000000000000
--- a/include/linux/kexec.h
+++ b/include/linux/kexec.h
@@@ -323,8 -325,7 +325,8 @@@ struct pt_regs
struct task_struct;
static inline void crash_kexec(struct pt_regs *regs) { }
static inline int kexec_should_crash(struct task_struct *p) { return 0; }
+#define kexec_in_progress false
- #endif /* CONFIG_KEXEC */
+ #endif /* CONFIG_KEXEC_CORE */
#endif /* !defined(__ASSEBMLY__) */
next reply other threads:[~2015-08-06 6:35 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-06 6:35 Stephen Rothwell [this message]
2015-08-06 21:12 ` linux-next: manual merge of the akpm-current tree with the char-misc tree Greg KH
-- strict thread matches above, loose matches on Subject: below --
2015-01-13 5:49 Stephen Rothwell
2014-01-14 4:51 Stephen Rothwell
2014-01-14 8:31 ` Winkler, Tomas
2014-01-15 1:57 ` Ian Munsie
2014-01-15 22:36 ` Winkler, Tomas
2014-01-15 23:52 ` Ian Munsie
2014-01-10 4:36 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=20150806163552.5eabeba3@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=arnd@arndb$(echo .)de \
--cc=dyoung@redhat$(echo .)com \
--cc=greg@kroah$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=vkuznets@redhat$(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