search

liquidctl / liquidtux

Linux kernel hwmon drivers for AIO liquid coolers and other devices
Other
80 stars 15 forks source link

Match file locations with (expected) kernel ones. #39

Closed amezin closed 5 months ago

amezin commented 1 year ago

Closes #33

Signed-off-by: Aleksandr Mezin mezin.alexander@gmail.com

jonasmalacofilho commented 1 year ago

While you're at it, you can also delete nzxt-smartdevice.rst. As far as I can see/remember, it's just a mistake that 00bcb937be27caf0ee0a6fb0f6c191474c858e0b didn't remove it.

jonasmalacofilho commented 1 year ago

Please rebase to remove duplicate commits (now that #41 has been merged).

amezin commented 1 year ago

@jonasmalacofilho Please take a look at Settings -> Branches -> Branch protection rules -> Require status checks to pass before merging -> Require branches to be up to date before merging

Also, is anything wrong with "Rebase and merge" method? It keeps the original commit message

amezin commented 1 year ago

@jonasmalacofilho So, may I merge this?

While you're at it, you can also delete nzxt-smartdevice.rst

Should be a separate change/pull request IMO

amezin commented 1 year ago

Nothing wrong here, but let's not move files from under #44.

That can be resolved by git rebase automatically (but not GitHub UI though). I've already checked by rebasing this PR after https://github.com/liquidctl/liquidtux/commit/e5b8c7165496cf21329d0ff290adf4e5e5e19c2e. File moved in one branch, modified in place in another -> automatic conflict resolution.

Meanwhile this pull request not being merged blocks me from further progress - I have to work with master branch, then manually fix this pull request (when the changes affect Makefile, for example).

cc @aleksamagicka

jonasmalacofilho commented 1 year ago

Meanwhile this pull request not being merged blocks me from further progress - I have to work with master branch, then manually fix this pull request (when the changes affect Makefile, for example).

Your argument is that you're annoyed to have to do this, so I should push the burden on the other person?

If that's it, then sorry, no, an open – and nearly ready – PR with driver changes takes priority.

stalkerg commented 1 year ago

anyway, this PR should be updated