linux-kernel - linux-next: manual merge of the driver-core tree with the pm 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>] [thread-next>] [day] [month] [year] [list]

Date:	Tue, 11 Nov 2014 15:41:46 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Greg KH <greg@...ah.com>, "Rafael J. Wysocki" <rjw@...ysocki.net>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Sudeep Holla <sudeep.holla@....com>
Subject: linux-next: manual merge of the driver-core tree with the pm tree

Hi Greg,

Today's linux-next merge of the driver-core tree got a conflict in
drivers/base/Makefile between commit b31384fa5de3 ("Driver core:
Unified device properties interface for platform firmware") from the pm
tree and commit 246246cbde5e ("drivers: base: support cpu cache
information interface to userspace via sysfs") from the driver-core
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/base/Makefile
index 53c3fe1aeb29,e81a55ca513c..000000000000
--- a/drivers/base/Makefile
+++ b/drivers/base/Makefile
@@@ -4,7 -4,7 +4,7 @@@ obj-y			:= component.o core.o bus.o dd.
  			   driver.o class.o platform.o \
  			   cpu.o firmware.o init.o map.o devres.o \
  			   attribute_container.o transport_class.o \
- 			   topology.o container.o property.o
 -			   topology.o container.o cacheinfo.o
++			   topology.o container.o property.o cacheinfo.o
  obj-$(CONFIG_DEVTMPFS)	+= devtmpfs.o
  obj-$(CONFIG_DMA_CMA) += dma-contiguous.o
  obj-y			+= power/

Content of type "application/pgp-signature" skipped