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

[20.09] can-isotp: 20180629 -> 20200910 #97783

Closed

Conversation

@RaghavSood
Copy link
Contributor

@RaghavSood RaghavSood commented Sep 11, 2020

(cherry picked from commit 4dc07b6)

Motivation for this change

Fixes build for can-isotp

Backports: #97780
ZHF: #97479

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
(cherry picked from commit 4dc07b6)
@RaghavSood RaghavSood changed the title can-isotp: 20180629 -> 20200910 [20.09] can-isotp: 20180629 -> 20200910 Sep 11, 2020
@ofborg ofborg bot requested a review from ericevenchick Sep 11, 2020
@risicle
Copy link
Contributor

@risicle risicle commented Sep 11, 2020

The commit you've referenced in the cherry-pick is your original commit, but the PR was rebase-merged, so it isn't actually in master. Please look up the final commit that made it into master and switch it (I know this is a pain, sorry).

@RaghavSood
Copy link
Contributor Author

@RaghavSood RaghavSood commented Sep 12, 2020

@risicle I see, sure - looks like the PR for master is still pending, so I'll have to wait until it is merged before I can pick a rebased commit from master.

Although, if I'm not mistaken, once the original PR is merged, the commit cherry picked by this one will be present in master as there are no conflicts, and it should be a straightforward merge - would I still need to redo this PR and pick another commit?

@risicle
Copy link
Contributor

@risicle risicle commented Sep 12, 2020

Ah I didn't notice the original was still unmerged - we generally don't open the backport PR until the original is merged.

Even if there are no conflicts, whoever merges the original could choose to do a "rebase merge" because they prefer a branchless result as it's neater. So really you never know what the final commit hash is going to be until it's merged.

@RaghavSood
Copy link
Contributor Author

@RaghavSood RaghavSood commented Sep 12, 2020

Makes sense, I will update this PR if the original commit doesn't make it to master.

Was just following other recent PRs for 20.09 backports, but I'll open them after the change is in master in the future, thanks for the tip!

@jonringer
Copy link
Contributor

@jonringer jonringer commented Sep 20, 2020

When backporting changes, please follow https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md#backporting-changes.

Namely, you should be doing git cherry-pick -x <rev> from a commit that has already landed in master. If the branches have diverged, you may alter the commit or add another commit to ensure that the package is able to still evaluate and build

Other PR was merged

@vcunat vcunat self-assigned this Oct 18, 2020
@vcunat
Copy link
Member

@vcunat vcunat commented Oct 18, 2020

Picked as 10e804f.

@vcunat vcunat closed this Oct 18, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants
You can’t perform that action at this time.