merge: Currency merge with upstream scarthgap branch

[pratheekshasn]

Merge latest from upstream. No conflicts.

#AB2951036

• bitbake packagefeed-ni-core
• bitbake packagegroup-ni-desirable
• bitbake package-index && bitbake nilrt-base-system-image
• Reimaged a cRIO with the new base image and successfully booted it

[chaitu236]

@pratheekshasn I see that this was merged using GitHub's UI (or was incorrectly merged from cmdline). This changes hashes. So we should never do this for upstream-merge PRs and should only be using cmdline and retain hashes. I believe this is mentioned in the WIs.

Notice that HEAD's hash in our repo is 14ef7c8 whereas upstream's hash is 76b9779.

This means our tree has diverged from upstream and all further upstream-merges will cause a merge commit to be created.

Also, I assume you tested these upstream merge changes along with the other repos' upstream merge changes; in this case we want to merge all the PRs at the same time. Because there is a (small) possibility that one repo's changes depend on another repo's changes which may cause build failures or other issues.

[pratheekshasn]

I hadn't used the GitHub UI, I used these commands to change the previously wrong values of author name and email address:
git commit --amend --author="Pratheeksha S N <pratheeksha.s.n@emerson.com>" --no-edit
git commit --amend -s

Do I need to revert and redo this?

[chaitu236]

I hadn't used the GitHub UI, I used these commands to change the previously wrong values of author name and email address

This PR didn't have wrong author name/email because it just fast-forwarded to upstream's HEAD (only the other PRs that had merge commits had that issue). Am I missing something?

Do I need to revert and redo this?

No, reverting a commit will not change git history.

[pratheekshasn]

This PR didn't have wrong author name/email because it just fast-forwarded to upstream's HEAD (only the other PRs that had merge commits had that issue). Am I missing something?

All right. I'm not sure why that happened, I did use the upstream_merge script in the nilrt repo.