Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1445282

linux-next: manual merge of the rtc tree with the tip tree

Show all headers | View raw

Hi Alexandre,

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

  arch/x86/platform/efi/efi_64.c

between commit:

  cc3ae7b0af27 ("x86/platform: Audit and remove any unnecessary uses of module.h")

from the tip tree and commit:

  5ab788d73832 ("rtc: cmos: move mc146818rtc code out of asm-generic/rtc.h")

from the rtc 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/x86/platform/efi/efi_64.c
index 04db6fbce96d,663c282801f3..000000000000
--- a/arch/x86/platform/efi/efi_64.c
+++ b/arch/x86/platform/efi/efi_64.c
@@@ -24,7 -24,8 +24,8 @@@
  #include <linux/spinlock.h>
  #include <linux/bootmem.h>
  #include <linux/ioport.h>
 -#include <linux/module.h>
 +#include <linux/init.h>
+ #include <linux/mc146818rtc.h>
  #include <linux/efi.h>
  #include <linux/uaccess.h>
  #include <linux/io.h>

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

linux-next: manual merge of the rtc tree with the tip tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-07-18 10:00 +0200

csiph-web