| 13 Mar 2026 |
 Vladimír Čunát | There's still x86_64-darwin openblas | 06:36:57 |
| Vladimír Čunát | It's time for some staging-nixos, as discussed in #security:nixos.org | 06:38:30 |
 K900 | Then I guess we have to revert the kernel bump | 06:41:13 |
| Vladimír Čunát | Darwin builds tend to get stuck now on "sending inputs". (no idea why or what's changed) Maybe that's making things worse. | 06:47:32 |
 Alyssa Ross | Unclear to me what's going on with the kernels because nobody posted what the regression actually is | 07:49:23 |
| Vladimír Čunát | Simply unblocking the other changes sounds reasonable to me. | 07:57:19 |
| Alyssa Ross | Yeah, I guess. Just a shame to revert the kernels when there could be no significant issue with them. | 07:57:57 |
| Alyssa Ross | Okay the kernels are confirmed fine. | 08:09:44 |
 Ramses 🇵🇸 | is there any docs on how to fix a merge conflict when merging master in -next? I don't immediately find anything by grepping in the repo. Is this just manual merge and push? | 11:29:41 |
| Ramses 🇵🇸 | * are there any docs on how to fix a merge conflict when merging master into -next? I don't immediately find anything by grepping in the repo. Is this just manual merge and push? | 11:30:03 |
| K900 | Yes | 11:31:08 |
| Ramses 🇵🇸 | ok, fix is trivial (go version difference), I'll push the merge then | 11:34:21 |
