Merge Linux 5.14 (support Matias and Keychron keyboards)

free5lot / hid-apple-patched

Allows to swap the Fn key and left Control key and other tweaks on Macbook Pro and Apple keyboards in GNU/Linux

GNU General Public License v2.0

349 stars 61 forks source link

Merge Linux 5.14 (support Matias and Keychron keyboards) #76

Closed almson closed 2 years ago

almson commented 3 years ago

No description provided.

I submitted it yesterday.

https://lore.kernel.org/patchwork/patch/1479207/

I'm confused. Wasn't it merged into 5.14-rc4 three weeks ago https://github.com/torvalds/linux/commit/ebe0b42a4252333aa4af60fd4d11b69405aa6068 I'm cherry-picking the upstream commit instead of making a new one (preserving authorship, etc.).

closewait commented 3 years ago

I am too now.

I've sent the changes based on this git repo (master) git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git

After checking: this hid repo is not in sync with the other. I will close my pull request since it's better to keep yours.

free5lot commented 3 years ago

To be clear, this PR is not needed anymore as the same upstream backporting was already done in previous PR #75, am I getting it right?

free5lot commented 2 years ago

Sorry, I misunderstood the message of @closewait and thought this PR is not needed and going to be closed, but no one corrected me nor answered, so I did not accept it earlier.

@almson thank you for your help, merged!