* linux-next: manual merge of the pm tree with the ia64 tree
@ 2014-07-15 3:56 Stephen Rothwell
2014-07-15 12:15 ` Rafael J. Wysocki
0 siblings, 1 reply; 4+ messages in thread
From: Stephen Rothwell @ 2014-07-15 3:56 UTC (permalink / raw)
To: Rafael J. Wysocki, Lv Zheng, Tony Luck
Cc: linux-next, linux-kernel, Chen, Gong
[-- Attachment #1: Type: text/plain, Size: 2486 bytes --]
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).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/acpi/acpi_extlog.c
index 0ad6f389d922,340d09518f8e..000000000000
--- a/drivers/acpi/acpi_extlog.c
+++ b/drivers/acpi/acpi_extlog.c
@@@ -139,12 -137,8 +139,12 @@@ static int extlog_print(struct notifier
struct mce *mce = (struct mce *)data;
int bank = mce->bank;
int cpu = mce->extcpu;
- struct acpi_generic_status *estatus, *tmp;
- struct acpi_generic_data *gdata;
- struct acpi_hest_generic_status *estatus;
- int rc;
++ struct acpi_hest_generic_status *estatus, *tmp;
++ struct acpi_hest_generic_data *gdata;
+ const uuid_le *fru_id = &NULL_UUID_LE;
+ char *fru_text = "";
+ uuid_le *sec_type;
+ static u32 err_seq;
estatus = extlog_elog_entry_check(cpu, bank);
if (estatus == NULL)
@@@ -154,29 -148,8 +154,29 @@@
/* clear record status to enable BIOS to update it again */
estatus->block_status = 0;
- tmp = (struct acpi_generic_status *)elog_buf;
- rc = print_extlog_rcd(NULL, (struct acpi_hest_generic_status *)elog_buf, cpu);
++ tmp = (struct acpi_hest_generic_status *)elog_buf;
+
+ if (!ras_userspace_consumers()) {
+ print_extlog_rcd(NULL, tmp, cpu);
+ goto out;
+ }
+
+ /* log event via trace */
+ err_seq++;
- gdata = (struct acpi_generic_data *)(tmp + 1);
++ gdata = (struct acpi_hest_generic_data *)(tmp + 1);
+ if (gdata->validation_bits & CPER_SEC_VALID_FRU_ID)
+ fru_id = (uuid_le *)gdata->fru_id;
+ if (gdata->validation_bits & CPER_SEC_VALID_FRU_TEXT)
+ fru_text = gdata->fru_text;
+ sec_type = (uuid_le *)gdata->section_type;
+ if (!uuid_le_cmp(*sec_type, CPER_SEC_PLATFORM_MEM)) {
+ struct cper_sec_mem_err *mem = (void *)(gdata + 1);
+ if (gdata->error_data_length >= sizeof(*mem))
+ trace_extlog_mem_event(mem, err_seq, fru_id, fru_text,
+ (u8)gdata->error_severity);
+ }
+out:
return NOTIFY_STOP;
}
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: linux-next: manual merge of the pm tree with the ia64 tree
2014-07-15 3:56 linux-next: manual merge of the pm tree with the ia64 tree Stephen Rothwell
@ 2014-07-15 12:15 ` Rafael J. Wysocki
2014-07-16 3:06 ` Zheng, Lv
0 siblings, 1 reply; 4+ messages in thread
From: Rafael J. Wysocki @ 2014-07-15 12:15 UTC (permalink / raw)
To: Stephen Rothwell, Lv Zheng
Cc: Tony Luck, linux-next, linux-kernel, Chen, Gong
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?
Rafael
> --=20
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
>
> diff --cc drivers/acpi/acpi_extlog.c
> index 0ad6f389d922,340d09518f8e..000000000000
> --- a/drivers/acpi/acpi_extlog.c
> +++ b/drivers/acpi/acpi_extlog.c
> @@@ -139,12 -137,8 +139,12 @@@ static int extlog_print(struct notifier
> struct mce *mce =3D (struct mce *)data;
> int bank =3D mce->bank;
> int cpu =3D mce->extcpu;
> - struct acpi_generic_status *estatus, *tmp;
> - struct acpi_generic_data *gdata;
> - struct acpi_hest_generic_status *estatus;
> - int rc;
> ++ struct acpi_hest_generic_status *estatus, *tmp;
> ++ struct acpi_hest_generic_data *gdata;
> + const uuid_le *fru_id =3D &NULL_UUID_LE;
> + char *fru_text =3D "";
> + uuid_le *sec_type;
> + static u32 err_seq;
> =20
> estatus =3D extlog_elog_entry_check(cpu, bank);
> if (estatus =3D=3D NULL)
> @@@ -154,29 -148,8 +154,29 @@@
> /* clear record status to enable BIOS to update it again */
> estatus->block_status =3D 0;
> =20
> - tmp =3D (struct acpi_generic_status *)elog_buf;
> - rc =3D print_extlog_rcd(NULL, (struct acpi_hest_generic_status *)elog_bu=
> f, cpu);
> ++ tmp =3D (struct acpi_hest_generic_status *)elog_buf;
> +
> + if (!ras_userspace_consumers()) {
> + print_extlog_rcd(NULL, tmp, cpu);
> + goto out;
> + }
> +
> + /* log event via trace */
> + err_seq++;
> - gdata =3D (struct acpi_generic_data *)(tmp + 1);
> ++ gdata =3D (struct acpi_hest_generic_data *)(tmp + 1);
> + if (gdata->validation_bits & CPER_SEC_VALID_FRU_ID)
> + fru_id =3D (uuid_le *)gdata->fru_id;
> + if (gdata->validation_bits & CPER_SEC_VALID_FRU_TEXT)
> + fru_text =3D gdata->fru_text;
> + sec_type =3D (uuid_le *)gdata->section_type;
> + if (!uuid_le_cmp(*sec_type, CPER_SEC_PLATFORM_MEM)) {
> + struct cper_sec_mem_err *mem =3D (void *)(gdata + 1);
> + if (gdata->error_data_length >=3D sizeof(*mem))
> + trace_extlog_mem_event(mem, err_seq, fru_id, fru_text,
> + (u8)gdata->error_severity);
> + }
> =20
> +out:
> return NOTIFY_STOP;
> }
> =20
>
> --Sig_/Cs291xJCrI1kc_+PiCdNT0M
> Content-Type: application/pgp-signature; name=signature.asc
> Content-Disposition: attachment; filename=signature.asc
>
> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG v2
>
> iQIcBAEBCAAGBQJTxKZpAAoJEMDTa8Ir7ZwVmnIP/2g7urRq6/whsLXGDEKOlYv+
> ZhKntRYDFYCTcP3BVWoVMxVkg3FrnH4nbM72qYxQEz5CIFTxLXC6mMyBCmkq6q/7
> P1fAwUE5RbcCy9p4Iyz43qCATSSpKY5Q/Yam2KixbRWZC2UTRGE+Ku1vqNZnY1WH
> Uzf7Cb1ShsGhKDZyitrNLHCaMMv1Ds2RES+P2ry6kx8mXms5S/nTB0v/a41Osz/r
> xPSRt715NJaHKHYuuOdag4ZWOgrbZjEVuvsxyoRZT9uj+6dQc+r7VnpHQ6kMnCpt
> 1X+0rqi3czijnDlZm1FuK/18Peib0+JNbM4vYEanhMxKT1GDxhwuO7t8b3J+19Z1
> /Z6eOsaRn+rxUb5TEvSkDRFiev2itbTcYK5vKQ03RfzeGB2wPxTMvOxRMungVlFZ
> z3i5IVe+awMs5VOWIL4BkJMaQWCqfXtG9iPC22QnFLWHaoZp6d06mFXdUbkNZwhw
> 3u1SaeuoN+mKo+1GnJOfry8MCYQnqmyRbf2tH5Mk+w9THfkHc+C911p1ff0Lw/gF
> T3flTK7sRyaPtpQrGCK8W74++b75Y/98XQ4N4bb2MJrym7yT3kh2avQMpQKNG3GO
> pTJKpKwvp5H3hbYl+CpOJ4i5EAlvG11qstwcih+nFPXebcEfspHRoeHInxgg+zDT
> Sj9YngNGGQR1//SaTD67
> =oSfG
> -----END PGP SIGNATURE-----
>
> --Sig_/Cs291xJCrI1kc_+PiCdNT0M--
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
>
--
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.
^ permalink raw reply [flat|nested] 4+ messages in thread
* RE: linux-next: manual merge of the pm tree with the ia64 tree
2014-07-15 12:15 ` Rafael J. Wysocki
@ 2014-07-16 3:06 ` Zheng, Lv
2014-07-16 21:53 ` Rafael J. Wysocki
0 siblings, 1 reply; 4+ messages in thread
From: Zheng, Lv @ 2014-07-16 3:06 UTC (permalink / raw)
To: Rafael J. Wysocki, Stephen Rothwell
Cc: Luck, Tony, linux-next, linux-kernel, Chen, Gong
Hi,
> From: Rafael J. Wysocki [mailto:rjw@rjwysocki.net]
> 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 and best regards
-Lv
>
> Rafael
>
>
> > --=20
> > Cheers,
> > Stephen Rothwell sfr@canb.auug.org.au
> >
> > diff --cc drivers/acpi/acpi_extlog.c
> > index 0ad6f389d922,340d09518f8e..000000000000
> > --- a/drivers/acpi/acpi_extlog.c
> > +++ b/drivers/acpi/acpi_extlog.c
> > @@@ -139,12 -137,8 +139,12 @@@ static int extlog_print(struct notifier
> > struct mce *mce =3D (struct mce *)data;
> > int bank =3D mce->bank;
> > int cpu =3D mce->extcpu;
> > - struct acpi_generic_status *estatus, *tmp;
> > - struct acpi_generic_data *gdata;
> > - struct acpi_hest_generic_status *estatus;
> > - int rc;
> > ++ struct acpi_hest_generic_status *estatus, *tmp;
> > ++ struct acpi_hest_generic_data *gdata;
> > + const uuid_le *fru_id =3D &NULL_UUID_LE;
> > + char *fru_text =3D "";
> > + uuid_le *sec_type;
> > + static u32 err_seq;
> > =20
> > estatus =3D extlog_elog_entry_check(cpu, bank);
> > if (estatus =3D=3D NULL)
> > @@@ -154,29 -148,8 +154,29 @@@
> > /* clear record status to enable BIOS to update it again */
> > estatus->block_status =3D 0;
> > =20
> > - tmp =3D (struct acpi_generic_status *)elog_buf;
> > - rc =3D print_extlog_rcd(NULL, (struct acpi_hest_generic_status *)elog_bu=
> > f, cpu);
> > ++ tmp =3D (struct acpi_hest_generic_status *)elog_buf;
> > +
> > + if (!ras_userspace_consumers()) {
> > + print_extlog_rcd(NULL, tmp, cpu);
> > + goto out;
> > + }
> > +
> > + /* log event via trace */
> > + err_seq++;
> > - gdata =3D (struct acpi_generic_data *)(tmp + 1);
> > ++ gdata =3D (struct acpi_hest_generic_data *)(tmp + 1);
> > + if (gdata->validation_bits & CPER_SEC_VALID_FRU_ID)
> > + fru_id =3D (uuid_le *)gdata->fru_id;
> > + if (gdata->validation_bits & CPER_SEC_VALID_FRU_TEXT)
> > + fru_text =3D gdata->fru_text;
> > + sec_type =3D (uuid_le *)gdata->section_type;
> > + if (!uuid_le_cmp(*sec_type, CPER_SEC_PLATFORM_MEM)) {
> > + struct cper_sec_mem_err *mem =3D (void *)(gdata + 1);
> > + if (gdata->error_data_length >=3D sizeof(*mem))
> > + trace_extlog_mem_event(mem, err_seq, fru_id, fru_text,
> > + (u8)gdata->error_severity);
> > + }
> > =20
> > +out:
> > return NOTIFY_STOP;
> > }
> > =20
> >
> > --Sig_/Cs291xJCrI1kc_+PiCdNT0M
> > Content-Type: application/pgp-signature; name=signature.asc
> > Content-Disposition: attachment; filename=signature.asc
> >
> > -----BEGIN PGP SIGNATURE-----
> > Version: GnuPG v2
> >
> > iQIcBAEBCAAGBQJTxKZpAAoJEMDTa8Ir7ZwVmnIP/2g7urRq6/whsLXGDEKOlYv+
> > ZhKntRYDFYCTcP3BVWoVMxVkg3FrnH4nbM72qYxQEz5CIFTxLXC6mMyBCmkq6q/7
> > P1fAwUE5RbcCy9p4Iyz43qCATSSpKY5Q/Yam2KixbRWZC2UTRGE+Ku1vqNZnY1WH
> > Uzf7Cb1ShsGhKDZyitrNLHCaMMv1Ds2RES+P2ry6kx8mXms5S/nTB0v/a41Osz/r
> > xPSRt715NJaHKHYuuOdag4ZWOgrbZjEVuvsxyoRZT9uj+6dQc+r7VnpHQ6kMnCpt
> > 1X+0rqi3czijnDlZm1FuK/18Peib0+JNbM4vYEanhMxKT1GDxhwuO7t8b3J+19Z1
> > /Z6eOsaRn+rxUb5TEvSkDRFiev2itbTcYK5vKQ03RfzeGB2wPxTMvOxRMungVlFZ
> > z3i5IVe+awMs5VOWIL4BkJMaQWCqfXtG9iPC22QnFLWHaoZp6d06mFXdUbkNZwhw
> > 3u1SaeuoN+mKo+1GnJOfry8MCYQnqmyRbf2tH5Mk+w9THfkHc+C911p1ff0Lw/gF
> > T3flTK7sRyaPtpQrGCK8W74++b75Y/98XQ4N4bb2MJrym7yT3kh2avQMpQKNG3GO
> > pTJKpKwvp5H3hbYl+CpOJ4i5EAlvG11qstwcih+nFPXebcEfspHRoeHInxgg+zDT
> > Sj9YngNGGQR1//SaTD67
> > =oSfG
> > -----END PGP SIGNATURE-----
> >
> > --Sig_/Cs291xJCrI1kc_+PiCdNT0M--
> > --
> > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> > the body of a message to majordomo@vger.kernel.org
> > More majordomo info at http://vger.kernel.org/majordomo-info.html
> > Please read the FAQ at http://www.tux.org/lkml/
> >
>
> --
> I speak only for myself.
> Rafael J. Wysocki, Intel Open Source Technology Center.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: linux-next: manual merge of the pm tree with the ia64 tree
2014-07-16 3:06 ` Zheng, Lv
@ 2014-07-16 21:53 ` Rafael J. Wysocki
0 siblings, 0 replies; 4+ messages in thread
From: Rafael J. Wysocki @ 2014-07-16 21:53 UTC (permalink / raw)
To: Zheng, Lv
Cc: Stephen Rothwell, Luck, Tony, linux-next, linux-kernel, Chen, Gong
On Wednesday, July 16, 2014 03:06:13 AM Zheng, Lv wrote:
> Hi,
>
> > From: Rafael J. Wysocki [mailto:rjw@rjwysocki.net]
> > 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
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-07-16 21:35 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-07-15 3:56 linux-next: manual merge of the pm tree with the ia64 tree Stephen Rothwell
2014-07-15 12:15 ` Rafael J. Wysocki
2014-07-16 3:06 ` Zheng, Lv
2014-07-16 21:53 ` Rafael J. Wysocki
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).