linux-kernel - Re: linux-next: manual merge of the mfd 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-prev] [day] [month] [year] [list]

Message-ID: <20150729074419.GG2284@x1>
Date:	Wed, 29 Jul 2015 08:44:19 +0100
From:	Lee Jones <lee.jones@...aro.org>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	"Rafael J. Wysocki" <rjw@...ysocki.net>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Mika Westerberg <mika.westerberg@...ux.intel.com>,
	Andy Shevchenko <andriy.shevchenko@...ux.intel.com>
Subject: Re: linux-next: manual merge of the mfd tree with the pm tree

> Hi Lee,

Morning Stephen.

> Today's linux-next merge of the mfd tree got a conflict in:
> 
>   drivers/acpi/scan.c
> 
> between commit:
> 
>   68c6b148daa6 ("ACPI / scan: Move device matching code to bus.c")
> 
> from the pm tree and commit:
> 
>   712e960f0ee9 ("ACPI / PM: Attach ACPI power domain only once")
> 
> from the mfd tree.

I believe this will go away when Rafael pulls [0]

[0] http://www.kernelhub.org/?msg=803290&p=2

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/