[lkml]   [2017]   [Sep]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
SubjectRe: linux-next: manual merge of the pm tree with the dmi tree
Hi Stephen,

On jeu., 2017-08-31 at 11:07 +1000, Stephen Rothwell wrote:
> Hi all,
> Today's linux-next merge of the pm tree got a conflict in:
> drivers/acpi/blacklist.c
> between commit:
> f996c4155d0d ("dmi: Mark all struct dmi_system_id instances const")
> from the dmi tree and commit:
> 5aa5911a0ed9 ("ACPI / blacklist: add acpi_match_platform_list()")
> from the pm tree.
> I fixed it up (see below) and can carry the fix as necessary. This

Below, where?

> 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.

Jean Delvare
SUSE L3 Support

 \ /
  Last update: 2017-09-01 15:21    [W:0.035 / U:3.524 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site