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

linux: 4.10-rc1 -> 4.10-rc2 #21613

Closed
wants to merge 1 commit into from

Conversation

NeQuissimus
Copy link
Member

Motivation for this change

Update

Things done
  • Tested using sandboxing
    (nix.useSandbox on NixOS,
    or option build-use-sandbox in nix.conf
    on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • Linux
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@mention-bot
Copy link

@NeQuissimus, thanks for your PR! By analyzing the history of the files in this pull request, we identified @dezgeg, @thoughtpolice and @7c6f434c to be potential reviewers.

@dezgeg
Copy link
Contributor

dezgeg commented Jan 3, 2017

There is an equivalent in master already: 2a4c831

@grahamc
Copy link
Member

grahamc commented Jan 3, 2017

Interesting that this isn't showing a merge conflict?

@NeQuissimus
Copy link
Member Author

Oh, my bad...

@NeQuissimus NeQuissimus closed this Jan 3, 2017
@NeQuissimus NeQuissimus deleted the kernel_4_10-rc2 branch January 3, 2017 14:14
@dezgeg
Copy link
Contributor

dezgeg commented Jan 3, 2017

It's not a conflict since both sides of the merge end up with identical contents.

@7c6f434c
Copy link
Member

7c6f434c commented Jan 5, 2017

@grahamc «accidental clean merge» is allowed not to show a conflict. You can merge it just fine, I guess.

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

Successfully merging this pull request may close these issues.

None yet

5 participants