From 07ffc97f851eb75f768b225bbeda6ac0bca566cd Mon Sep 17 00:00:00 2001 From: Tk-Glitch Date: Wed, 3 Jun 2020 19:42:57 +0200 Subject: [PATCH] Sync > linux-tkg: linux54-tkg: 5.4.44 > linux-tkg: linux56-tkg: 5.6.16 > wine-tkg-git: Hotfixer: Disable LAA and protonify patchsets when the user refuses hotfixes > wine-tkg-git: Import rebased https://github.com/ValveSoftware/wine/commit/b658ec59714a8cdb2f7c6cf6b1d5782f7d1de6fa to proton-sdl-joy-2 patchset > wine-tkg-git: Proton-tkg: Set _hotfixes_no_confirm by default. > wine-tkg-git: Proton-tkg: Add PROTON_NO_WRITE_WATCH entry to user_settings.py > wine-tkg-git: Initial sync with Proton 5.0-8 RC > wine-tkg-git: Silence hotfixer warning on mainline > wine-tkg-git: Nuke reportedly problematic hunks from proton-winevulkan patchsets > wine-tkg-git: Hotfixer: Robustness enhancements and fixes - Introduce the "earlyhotfixer" script, that gets loaded at the time we previously loaded the "normal" hotfixer - Move early checks (community patches and broken staging upstream commit hotfixing) to "earlyhotfixer" and remove the "early" userpatching from prepare - Load the hotfixer right before the nonuser_reverter checks, so our sources are correctly checked out ready for reverting work (it was running too early before, leading to potential breakage on legacy) - Run the hotfixer after the nonuser_reverter so we don't end up with conflicts preventing git to do its job - Don't set _broken_staging_44d1a45_localreverts="true" unconditionally if esync or fsync is disabled - Replace the _patches variable by a separate _hotfixes one to contain our hotfixes array. This prevents a potential conflict with userpatches - Check for the oldest hotfix-needy commit before prompting the user about hotfixes - Remove unneeded fluff > wine-tkg-git: Update wine-tkg patch (mainline) for c7760ce, and move previous version to legacy. --- linux-tkg | 2 +- wine-tkg-git | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/linux-tkg b/linux-tkg index 15c1881..a644d08 160000 --- a/linux-tkg +++ b/linux-tkg @@ -1 +1 @@ -Subproject commit 15c188130119b002ee455e7096d4a3313f86ad08 +Subproject commit a644d088f25c541c02f5da7f53bf3a776e5d1d69 diff --git a/wine-tkg-git b/wine-tkg-git index aa89ef3..50bb95b 160000 --- a/wine-tkg-git +++ b/wine-tkg-git @@ -1 +1 @@ -Subproject commit aa89ef3a12a6cadced6f54531e01172590f9eeb7 +Subproject commit 50bb95bb17b422520987f70ab5bb68cecc2d0f18