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

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: <20160718175546.79c66373@canb.auug.org.au>
Date:	Mon, 18 Jul 2016 17:55:46 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Alexandre Belloni <alexandre.belloni@...e-electrons.com>,
	Thomas Gleixner <tglx@...utronix.de>,
	Ingo Molnar <mingo@...e.hu>, "H. Peter Anvin" <hpa@...or.com>,
	Peter Zijlstra <peterz@...radead.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Arnd Bergmann <arnd@...db.de>,
	Paul Gortmaker <paul.gortmaker@...driver.com>
Subject: linux-next: manual merge of the rtc tree with the tip tree

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>