Skip to content

Actions: microsoft/azurelinux

Actions

Github Merge Conflict Check

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
merge-conflict-check.yml
2,962 workflow runs
2,962 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

[AUTOPATCHER-CORE] Upgrade influx-cli to 2.7.5 Update influx-cli to match influxdb version for CVE-2023-44487 Github Merge Conflict Check #3613: Pull request #12281 opened by CBL-Mariner-Bot
February 11, 2025 01:00 32s cblmargh/influx-cli-upgrade-to-2.7.5-fasttrack/3.0
cblmargh/influx-cli-upgrade-to-2.7.5-fasttrack/3.0
February 11, 2025 01:00 32s
Remove guava20 from SPECS-EXTENDED Github Merge Conflict Check #3612: Pull request #12280 opened by kevin-b-lockwood
February 11, 2025 00:58 34s kevin-b-lockwood:kevin-b-lockwood/guava20-remove
kevin-b-lockwood:kevin-b-lockwood/guava20-remove
February 11, 2025 00:58 34s
[AUTOPATCHER-kernel] Kernel CVE - branch 3.0-dev - CVE-2024-41080 CVE-2024-42252 CVE-2024-49911 CVE-2024-49915 CVE-2024-50067 CVE-2024-50027 CVE-2024-49926 CVE-2024-49891 CVE-2024-43913 CVE-2024-27011 CVE-2024-50010 CVE-2024-43857 CVE-2024-49934 CVE-2024-43904 CVE-2024-43911 CVE-2024-44955 CVE-2024-44950 CVE-2024-49897 CVE-2024-42122 CVE-2024-49914 CVE-2022-48635 CVE-2024-43835 CVE-2024-53085 CVE-2023-52920 CVE-2024-40965 CVE-2024-49906 CVE-2024-44963 CVE-2024-49909 CVE-2024-36910 CVE-2024-49974 CVE-2024-42156 CVE-2024-36972 CVE-2024-49899 CVE-2024-49917 CVE-2024-49898 CVE-2024-46841 Github Merge Conflict Check #3611: Pull request #12279 opened by CBL-Mariner-Bot
February 11, 2025 00:23 37s cblmargh/kernel-CVE-3.0-dev
cblmargh/kernel-CVE-3.0-dev
February 11, 2025 00:23 37s
[AUTOPATCHER-kernel] Kernel CVE - branch main - CVE-2024-38538 CVE-2024-46854 CVE-2023-52913 CVE-2024-47673 CVE-2024-50058 CVE-2024-46852 CVE-2024-43841 CVE-2024-36893 CVE-2024-43849 CVE-2024-50036 CVE-2024-46695 CVE-2024-46859 CVE-2024-43846 CVE-2024-50010 CVE-2024-46855 CVE-2024-39463 CVE-2024-43835 CVE-2024-47672 CVE-2021-47482 CVE-2024-50072 CVE-2024-44931 CVE-2024-43834 CVE-2024-36972 CVE-2024-47670 CVE-2024-38545 CVE-2024-46853 CVE-2022-48635 CVE-2024-46849 CVE-2024-47671 CVE-2024-41080 Github Merge Conflict Check #3610: Pull request #12278 opened by CBL-Mariner-Bot
February 11, 2025 00:02 35s cblmargh/kernel-CVE-main
cblmargh/kernel-CVE-main
February 11, 2025 00:02 35s
fix merge issue with release bump down for python3 libs in toolchain … Github Merge Conflict Check #3609: Commit 55aa3f6 pushed by jslobodzian
February 10, 2025 23:40 32s fasttrack/3.0
fasttrack/3.0
February 10, 2025 23:40 32s
[AUTOPATCHER-kernel] Kernel upgrade to version 6.6.76.1 - branch 3.0-dev Github Merge Conflict Check #3608: Pull request #12277 opened by CBL-Mariner-Bot
February 10, 2025 23:29 33s cblmargh/kernel-upgrade-3.0-dev-6.6.76.1
cblmargh/kernel-upgrade-3.0-dev-6.6.76.1
February 10, 2025 23:29 33s
[AUTOPATCHER-CORE] Upgrade influxdb to 2.7.5 Upgrade influxdb to fix CVE-2023-44487 Github Merge Conflict Check #3607: Pull request #12276 opened by CBL-Mariner-Bot
February 10, 2025 22:59 43s cblmargh/influxdb-upgrade-to-2.7.5-fasttrack/3.0
cblmargh/influxdb-upgrade-to-2.7.5-fasttrack/3.0
February 10, 2025 22:59 43s
[Medium] wpa_supplicant: Fix CVE-2023-52160 Github Merge Conflict Check #3606: Pull request #12220 synchronize by v-smalavathu
February 10, 2025 21:28 33s v-smalavathu:v-smalavathu/wpa_supplicant/CVE-2023-52160
v-smalavathu:v-smalavathu/wpa_supplicant/CVE-2023-52160
February 10, 2025 21:28 33s
fix merge issue with release bump down for python3 libs in toolchain manifests Github Merge Conflict Check #3605: Pull request #12275 opened by sameluch
February 10, 2025 20:26 34s sammeluch/python3-libs-manifest-fix
sammeluch/python3-libs-manifest-fix
February 10, 2025 20:26 34s
Patch nodejs for CVE-2025-22150 Github Merge Conflict Check #3604: Pull request #12230 synchronize by sameluch
February 10, 2025 20:08 40s kanbansal/nodejs/3.0/CVE-2025-22150
kanbansal/nodejs/3.0/CVE-2025-22150
February 10, 2025 20:08 40s
Patch python-tqdm for CVE-2024-34062 Github Merge Conflict Check #3603: Pull request #12248 synchronize by sameluch
February 10, 2025 20:08 34s kanbansal/python-tqdm/CVE-2024-34062/3.0
kanbansal/python-tqdm/CVE-2024-34062/3.0
February 10, 2025 20:08 34s
Fix CVE-2025-0840 for binutils Github Merge Conflict Check #3602: Pull request #12254 synchronize by sameluch
February 10, 2025 20:08 38s sudipta/binutils-cve-2025-0840-ft3
sudipta/binutils-cve-2025-0840-ft3
February 10, 2025 20:08 38s
[Medium] assorted nodejs CVE fixes Github Merge Conflict Check #3601: Pull request #12259 synchronize by sameluch
February 10, 2025 20:08 36s kevin-b-lockwood:kevin-b-lockwood/nodejs-CVE-2020-28493
kevin-b-lockwood:kevin-b-lockwood/nodejs-CVE-2020-28493
February 10, 2025 20:08 36s
[Medium] patch ntopng to fix CVE-2021-44647 and CVE-2021-43519 Github Merge Conflict Check #3600: Pull request #12264 synchronize by sameluch
February 10, 2025 20:07 33s jykanase:topic_ntopng_3.0
jykanase:topic_ntopng_3.0
February 10, 2025 20:07 33s
Patch mysql for CVE-2025-0725 Github Merge Conflict Check #3599: Pull request #12267 synchronize by sameluch
February 10, 2025 20:06 37s kanbansal/mysql/CVE-2025-0725/3.0
kanbansal/mysql/CVE-2025-0725/3.0
February 10, 2025 20:06 37s
Remove patch file that was part of the vendor tarball upgrade to appl… Github Merge Conflict Check #3598: Commit 1bd27f7 pushed by jslobodzian
February 10, 2025 19:58 36s fasttrack/3.0
fasttrack/3.0
February 10, 2025 19:58 36s
[MANUAL-CHERRYPICK] Patch CVE-2023-27043 in python3 by patching (#121… Github Merge Conflict Check #3597: Commit f9991cf pushed by jslobodzian
February 10, 2025 19:51 37s 3.0-dev
3.0-dev
February 10, 2025 19:51 37s
[MANUAL-CHERRYPICK] Patch CVE-2023-27043 in python3 by patching (#12147) Github Merge Conflict Check #3596: Pull request #12274 opened by sameluch
February 10, 2025 19:49 33s cblmargh/cherry-pick-pr-12147-to-3.0-dev
cblmargh/cherry-pick-pr-12147-to-3.0-dev
February 10, 2025 19:49 33s
[AUTOPATCHER-kernel] Kernel upgrade to version 5.15.176.3 - branch main Github Merge Conflict Check #3595: Pull request #12273 opened by CBL-Mariner-Bot
February 10, 2025 19:47 32s cblmargh/kernel-upgrade-main-5.15.176.3
cblmargh/kernel-upgrade-main-5.15.176.3
February 10, 2025 19:47 32s
perl-Test-File: Update Version from 1.44.3 -> 1.99.3 Github Merge Conflict Check #3594: Pull request #11530 reopened by v-smalavathu
February 10, 2025 19:17 36s v-smalavathu:topic_perl-Test-File
v-smalavathu:topic_perl-Test-File
February 10, 2025 19:17 36s
perl-Test-EOL: Update Version from 2.00 -> 2.02 Github Merge Conflict Check #3593: Pull request #11525 reopened by v-smalavathu
February 10, 2025 19:16 32s v-smalavathu:topic_perl-Test-EOL
v-smalavathu:topic_perl-Test-EOL
February 10, 2025 19:16 32s
Upgraded mod_security_crs to version 4.2.0 Github Merge Conflict Check #3592: Pull request #11576 synchronize by aninda-al
February 10, 2025 19:01 39s aninda-al:upgrade-mod_modsecurity_crs
aninda-al:upgrade-mod_modsecurity_crs
February 10, 2025 19:01 39s
extended repo LVBS kernel Github Merge Conflict Check #3591: Pull request #12064 synchronize by ddstreet
February 10, 2025 18:55 36s ddstreet:kernel-lvbs
ddstreet:kernel-lvbs
February 10, 2025 18:55 36s
extended repo LVBS kernel Github Merge Conflict Check #3590: Pull request #12064 synchronize by ddstreet
February 10, 2025 18:49 34s ddstreet:kernel-lvbs
ddstreet:kernel-lvbs
February 10, 2025 18:49 34s
extended repo LVBS kernel Github Merge Conflict Check #3589: Pull request #12064 synchronize by ddstreet
February 10, 2025 18:38 40s ddstreet:kernel-lvbs
ddstreet:kernel-lvbs
February 10, 2025 18:38 40s