linux-kernel - linux-next: manual merge of the rtc tree with the mfd 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 for Android: free password hash cracker in your pocket

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20150620221617.375623f2@canb.auug.org.au>
Date:	Sat, 20 Jun 2015 22:16:17 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Alexandre Belloni <alexandre.belloni@...e-electrons.com>,
	Lee Jones <lee.jones@...aro.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: linux-next: manual merge of the rtc tree with the mfd tree

Hi Alexandre,

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

  drivers/rtc/Makefile

between commit:

  b5b2bdfc2893 ("rtc: st: Add new driver for ST's LPC RTC")

from the mfd tree and commit:

  766218609678 ("rtc: Properly sort Makefile")

from the rtc tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc drivers/rtc/Makefile
index ebe2c085d01c,5ea5370f56f2..000000000000
--- a/drivers/rtc/Makefile
+++ b/drivers/rtc/Makefile
@@@ -135,6 -139,6 +139,7 @@@ obj-$(CONFIG_RTC_DRV_SPEAR)	+= rtc-spea
  obj-$(CONFIG_RTC_DRV_STARFIRE)	+= rtc-starfire.o
  obj-$(CONFIG_RTC_DRV_STK17TA8)	+= rtc-stk17ta8.o
  obj-$(CONFIG_RTC_DRV_STMP)	+= rtc-stmp3xxx.o
++obj-$(CONFIG_RTC_DRV_ST_LPC)	+= rtc-st-lpc.o
  obj-$(CONFIG_RTC_DRV_SUN4V)	+= rtc-sun4v.o
  obj-$(CONFIG_RTC_DRV_SUN6I)	+= rtc-sun6i.o
  obj-$(CONFIG_RTC_DRV_SUNXI)	+= rtc-sunxi.o

Content of type "application/pgp-signature" skipped