Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CDAT updates #874

Merged
merged 2 commits into from May 16, 2023
Merged

CDAT updates #874

merged 2 commits into from May 16, 2023

Conversation

davejiang
Copy link
Contributor

A spelling correction for CDAT definition and the other adding additional CDAT defines.

ACPI_CEDT_DSMAS_NON_VOLATILE -> ACPI_CDAT_DSMAS_NON_VOLATILE

Signed-off-by: Dave Jiang <dave.jiang@intel.com>
Add upstream port and any port definitions for SSLBIS.

Signed-off-by: Dave Jiang <dave.jiang@intel.com>
Copy link
Contributor

@AlisonSchofield AlisonSchofield left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@sacdintel sacdintel merged commit e948142 into acpica:master May 16, 2023
@davejiang
Copy link
Contributor Author

@sacdintel I noticed that only 1 of the 2 patches are merged in. https://github.com/intel-sandbox/cxl/commit/8557c5673dbff1b09044ef356035b2e24319d6a0 was missed. Can you please also pick up that patch? Thank you!

@sacdintel
Copy link
Collaborator

Hi Dave,

I apologize if 1 of your 2 commits was not picked up for merge. I am not sure if there is some bug in GitHub or not, but I do see from my end that 2 commits were merged from this PR to our main branch. I am not sure if there is some script you wrote or if you have ported those 2 commits from somewhere else to ACPICA, but I am not exactly sure how GitHub works under the hood in those scenarios. I am attaching some screenshots that might help you understand what could have gone wrong or what needs to be done now. Please take a look and advise me on my next steps. Also I am not sure if and how I can merge the commit link from your comment earlier today directly into ACPICA. Thanks!
PR874_files_changed
PR874_aggregated
PR_874_commit_merged

@davejiang
Copy link
Contributor Author

@sacdintel I'm not sure either. To make things easier, why don't I put the missed patch on top of latest ACPICA code and create a new pull request? Would that work?

@sacdintel
Copy link
Collaborator

Yes, that would work and it will be the most simple & straightforward solution to this problem rather than having to deal with the intricacies of GitHub! Thanks! I'll merge the new PR as soon as I can!

@davejiang
Copy link
Contributor Author

@sacdintel #898

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants