Skip to content

Stable merge for week 37 of 2024#920

Merged
Eeems merged 6 commits intostablefrom
merge/2024-W37
Sep 15, 2024
Merged

Stable merge for week 37 of 2024#920
Eeems merged 6 commits intostablefrom
merge/2024-W37

Conversation

@Eeems
Copy link
Copy Markdown
Member

@Eeems Eeems commented Sep 14, 2024

Updated Packages

alistair23 and others added 3 commits September 13, 2024 18:46
* package/linux-mainline: Bump to 6.3

Signed-off-by: Alistair Francis <alistair@alistair23.me>

* No longer delete linux-mainline on os3

---------

Signed-off-by: Alistair Francis <alistair@alistair23.me>
Co-authored-by: Nathaniel van Diepen <Eeems@users.noreply.github.com>
* Change os version scheme

---------

Co-authored-by: Nathaniel van Diepen <Eeems@users.noreply.github.com>
* Update whiteboard-hypercard to 0.4.0

* Update whiteboard-hypercard to 0.5.0

Signed-off-by: Pierre Fenoll <pierrefenoll@gmail.com>

---------

Signed-off-by: Pierre Fenoll <pierrefenoll@gmail.com>
Co-authored-by: Nathaniel van Diepen <Eeems@users.noreply.github.com>
@Eeems Eeems added the merge Weekly merge of the testing branch into the stable branch label Sep 14, 2024
@Eeems

This comment was marked as resolved.

@Eeems

This comment was marked as resolved.

* Fix linux build again

* Update package
@Eeems Eeems added this to the 2024-W37 Merge Window milestone Sep 14, 2024
@Eeems
Copy link
Copy Markdown
Member Author

Eeems commented Sep 15, 2024

I've tested this all on my rM2 and it's working as expected. I would still not recommend people use linux-mainline on their device, but at least it's not bricking anything.

Copy link
Copy Markdown
Member

@LinusCDE LinusCDE left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Rubber stamped 👍

@Eeems Eeems merged commit 28b5ae4 into stable Sep 15, 2024
@Eeems Eeems deleted the merge/2024-W37 branch September 15, 2024 22:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

merge Weekly merge of the testing branch into the stable branch

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants