On Wednesday, July 16, 2014 03:06:13 AM Zheng, Lv wrote: > Hi, > > > From: Rafael J. Wysocki [mailto:rjw@xxxxxxxxxxxxx] > > Sent: Tuesday, July 15, 2014 8:15 PM > > > > On Tuesday, July 15, 2014 01:56:20 PM Stephen Rothwell wrote: > > > > > > --Sig_/Cs291xJCrI1kc_+PiCdNT0M > > > Content-Type: text/plain; charset=US-ASCII > > > Content-Transfer-Encoding: quoted-printable > > > > > > Hi Rafael, > > > > > > Today's linux-next merge of the pm tree got a conflict in > > > drivers/acpi/acpi_extlog.c between commits 2dfb7d51a61d ("trace, RAS: > > > Add eMCA trace event interface") and d6cae935ec5b ("trace, eMCA: Add a > > > knob to adjust where to save event log") from the ia64 tree and commit > > > 0a00fd5e20fd ("ACPICA: Restore error table definitions to reduce code > > > differences between Linux and ACPICA upstream") from the pm tree. > > > > > > I fixed it up (hopefully - see below) and can carry the fix as > > > necessary (no action is required). > > > > Thanks for fixing this up! > > > > Lv, can you please check if acpi_extlog.c is fine in linux-next? > > I checked. > > There is no problem in rafael/linux-pm.git/linux-next branch. > The 2 commits: > trace, RAS: Add eMCA trace event interface > trace, eMCA: Add a knob to adjust where to save event log > are not in torvalds/linux.git/master branch, I found them in aegl/linux.git/next branch. > > So if torvalds/linux.git/master merges rafael/linux-pm.git/linux-next before merging aegl/linux.git/next, we will need the following fix. > And the following collision fix is correct. Thanks for checking! Rafael -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
