linux-next: manual merge of the akpm-current tree with the char-misc tree

[Stephen Rothwell]

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@xxxxxxxxxxxxxxxx

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__) */
  
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/