[lkml]   [2017]   [Aug]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
Subjectlinux-next: manual merge of the pm tree with the dmi tree
Hi Rafael,

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


between commit:

f996c4155d0d ("dmi: Mark all struct dmi_system_id instances const")

from the dmi tree and commit:

630b3aff8a51 ("treewide: Consolidate Apple DMI checks")

from the pm tree.

I fixed it up (the latter removed the declaration updated by the former)
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.

Stephen Rothwell

 \ /
  Last update: 2017-08-07 03:40    [W:0.047 / U:1.568 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site