gh-ps5-linux/ps5-linux-patches
Watch
1
0
Fork
You've already forked ps5-linux-patches
 0
Code Issues 1 Pull requests 1 Releases Activity

BT fixes for LE, update for 7.2.y #35

Open
masterzorag wants to merge 1 commit from masterzorag/7.2.y into main
pull from: masterzorag/7.2.y
merge into: gh-ps5-linux:main
Conversation 3 Commits 1 Files changed 1 +30 -49
masterzorag commented 2026-09-19 10:17:12 -05:00 (Migrated from github.com)

Fixed BT LE support from @bizkut as github.com/notgitgit/ps5-linux-patches@b3fe6ddf64: main is behind;
Tested mouse+kbd via bt le with internal marvell

Fixed BT LE support from @bizkut as https://github.com/notgitgit/ps5-linux-patches/commit/b3fe6ddf64333c6626f5e08f8c4ddaab460cfa7f: main is behind; Tested mouse+kbd via bt **le** with internal marvell
👍 1
TheOfficialFloW commented 2026-09-20 11:01:39 -05:00 (Migrated from github.com)

xhci seems to break warm reboot via kexec

xhci seems to break warm reboot via kexec
masterzorag commented 2026-09-21 14:55:27 -05:00 (Migrated from github.com)

well, done a couple of tests and things are solid on my end: if I use ps5-linux-warm-reboot.sh I also get BT(+le) + wifi correctly back to work;
note "WLAN FW already running!" from dmesg, after kexec:

[    0.000000] Linux version 7.2.7-g4ade85 (user@i5-2400) (gcc (GCC) 16.2.1 20260819 (Red Hat 16.2.1-2), GNU ld version 2.46.1-1.fc44) #3 SMP PREEMPT_DYNAMIC Mon Sep 21 20:46:56 CEST 2026
[    0.000000] Command line: root=LABEL=fedora ro rootwait console=ttyTitania0 console=tty0 mitigations=off idle=halt preempt=full net.ifnames=0 tsc=unstable audit=0 selinux=0 apparmor=0 pci=realloc,pcie_bus_perf ttm.pages_limit=4194304
...
[    0.222095] xhci_hcd 0000:40:00.6: xHCI Host Controller
[    0.222103] xhci_hcd 0000:40:00.6: new USB bus registered, assigned bus number 1
[    0.222113] xhci_hcd 0000:40:00.6: spcie not initialized, deferring
[    0.222116] xhci_hcd 0000:40:00.6: can't setup: -517
[    0.222119] xhci_hcd 0000:40:00.6: USB bus 1 deregistered
[    0.222131] xhci_hcd 0000:40:00.6: init 0000:40:00.6 fail, -517
[    0.222153] xhci_hcd 0000:20:00.4: xHCI Host Controller
[    0.222157] xhci_hcd 0000:20:00.4: new USB bus registered, assigned bus number 1
[    0.222248] xhci_hcd 0000:20:00.4: hcc params 0x0260ffed hci version 0x110 quirks 0x0004000000000010
[    0.222321] xhci_hcd 0000:20:00.4: xHCI Host Controller
[    0.222321] xhci_hcd 0000:20:00.4: new USB bus registered, assigned bus number 2
[    0.222321] xhci_hcd 0000:20:00.4: Host supports USB 3.1 Enhanced SuperSpeed
[    0.222903] usb usb1: Manufacturer: Linux 7.2.7-g4ade85 xhci-hcd
[    0.222933] usb usb2: Manufacturer: Linux 7.2.7-g4ade85 xhci-hcd
[    0.222949] xhci_hcd 0000:20:00.5: xHCI Host Controller
[    0.222961] xhci_hcd 0000:20:00.5: new USB bus registered, assigned bus number 3
[    0.223041] xhci_hcd 0000:20:00.5: hcc params 0x0260ffed hci version 0x110 quirks 0x0004000000000010
[    0.223283] xhci_hcd 0000:20:00.5: xHCI Host Controller
[    0.223287] xhci_hcd 0000:20:00.5: new USB bus registered, assigned bus number 4
[    0.223290] xhci_hcd 0000:20:00.5: Host supports USB 3.1 Enhanced SuperSpeed
[    0.223327] usb usb3: Manufacturer: Linux 7.2.7-g4ade85 xhci-hcd
[    0.223893] usb usb4: Manufacturer: Linux 7.2.7-g4ade85 xhci-hcd
[    0.545843] usb 2-2: new SuperSpeed USB device number 2 using xhci_hcd
[    2.371653] xhci_hcd 0000:40:00.6: xHCI Host Controller
[    2.373570] xhci_hcd 0000:40:00.6: new USB bus registered, assigned bus number 5
[    2.379915] xhci_hcd 0000:40:00.6: PS5 Salina xHCI PHY initialized
[    2.380584] xhci_hcd 0000:40:00.6: // Reset the HC on custom Salina Reset
[    2.455248] xhci_hcd 0000:40:00.6: USB0 root hub has no ports
[    2.455334] xhci_hcd 0000:40:00.6: hcc params 0x0228fe6c hci version 0x110 quirks 0x0008800000000010
[    2.457824] xhci_hcd 0000:40:00.6: Salina: software IRQ poller enabled
[    2.470546] usb usb5: Manufacturer: Linux 7.2.7-g4ade85 xhci-hcd
[    2.717518] usb 5-3: new high-speed USB device number 2 using xhci_hcd
...
[    7.498374] wlan: Register to Bus Driver...
[    7.498374] PCI memory map Virt0: 00000000b5a75f18 PCI memory map Virt2: 00000000454c8e9b
[    7.498374] Attach moal handle ops, card interface type: 0x207
[    7.498374] rps set to f from module param
[    7.498374] No module param cfg file specified
[    7.498374] rx_work=1 cpu_num=16
[    7.498374] Enable moal_recv_amsdu_packet
[    7.498374] Attach mlan adapter operations.card_type is 0x207.
[    7.498814] Bluetooth: hci0: unexpected event for opcode 0x0000
[    7.502055] Request firmware: nxp/pcieuartiw620_combo_v1.bin
[    7.513807] kvm_amd: TSC scaling supported
[    7.513807] kvm_amd: Nested Virtualization enabled
[    7.513807] kvm_amd: Nested Paging enabled
[    7.513807] kvm_amd: LBR virtualization supported
[    7.513807] kvm_amd: Virtual VMLOAD VMSAVE supported
[    7.513807] kvm_amd: Virtual GIF supported
[    7.520165] WLAN FW already running! Skip FW download
[    7.520174] WLAN FW is active
[    7.520176] on_time is 7357886600
[    7.519807] Bluetooth: hci0: unexpected event for opcode 0x0000
[    7.521823] fw_cap_info=0x48fcbfa3, dev_cap_mask=0xffffffff
[    7.521823] max_p2p_conn = 0, max_sta_conn = 64
[    7.523824] IOCTL failed: 00000000323bf22a id=0x200000, sub_id=0x200046 action=1, status_code=0x3 [FW_CMDRESP]
[    7.524190] Register NXP 802.11 Adapter mlan0
[    7.524190] wlan: version = PCIEIW620-17.130.3.p32--MM6X17542.p8-GPL-(FP92) 
[    7.524854] wlan: Register to Bus Driver Done
[    7.524856] wlan: Driver loaded successfully
...
[    8.394124] wlan: Unloading MWLAN driver
[    8.394159] Station already not in enhanced deep sleep mode
[    8.496773] set pending clean
[    8.535736] Free module params
[    8.535788] wlan: Driver unloaded
...
[    8.591063] wlan: Loading MWLAN driver
[    8.591629] wlan: Register to Bus Driver...
[    8.591708] PCI memory map Virt0: 00000000e9d458c0 PCI memory map Virt2: 0000000043e73823
[    8.591715] Attach moal handle ops, card interface type: 0x207
[    8.591725] rps set to f from module param
[    8.591727] No module param cfg file specified
[    8.591736] rx_work=1 cpu_num=16
[    8.591738] Enable moal_recv_amsdu_packet
[    8.591746] Attach mlan adapter operations.card_type is 0x207.
[    8.595784] Request firmware: nxp/pcieuartiw620_combo_v1.bin
[    8.596300] WLAN FW already running! Skip FW download
[    8.596307] WLAN FW is active
[    8.596309] on_time is 8434722896
[    9.033002] Bluetooth: BNEP (Ethernet Emulation) ver 1.3
[    9.033008] Bluetooth: BNEP filters: protocol multicast
[    9.033013] Bluetooth: BNEP socket layer initialized
...
[    9.205561] fw_cap_info=0x48fcbfa3, dev_cap_mask=0xffffffff
[    9.205561] max_p2p_conn = 0, max_sta_conn = 64
[    9.207760] IOCTL failed: 000000004eb9e6fe id=0x200000, sub_id=0x200046 action=1, status_code=0x3 [FW_CMDRESP]
[    9.208643] Register NXP 802.11 Adapter mlan0
[    9.208643] wlan: version = PCIEIW620-17.130.3.p32--MM6X17542.p8-GPL-(FP92) 
[    9.208643] wlan: Register to Bus Driver Done
[    9.208643] wlan: Driver loaded successfully
[    9.221532] IOCTL failed: 00000000793c5e7f id=0x200000, sub_id=0x200046 action=1, status_code=0x3 [FW_CMDRESP]
[    9.254335] [drm] Failed to add display topology, DTM TA is not initialized.
[   10.211687] Bluetooth: MGMT ver 1.23
...
[   12.578146] input: Logi M196 Mouse as /devices/virtual/misc/uhid/0005:046D:B03F.0001/input/input4
[   12.578880] hid-generic 0005:046D:B03F.0001: input,hidraw0: BLUETOOTH HID v0.08 Mouse [Logi M196] on 5c:84:3c:4f:e5:1e
[   15.610878] Bluetooth: RFCOMM TTY layer initialized
[   15.610878] Bluetooth: RFCOMM socket layer initialized
[   15.610878] Bluetooth: RFCOMM ver 1.11
[   20.300048] rfkill: input handler disabled
[   27.525971] pci 0000:00:00.0: ps5_cpu_gov: Unexpected write to kernel-exclusive config offset b8
[   44.861667] input: Logi K250 Keyboard as /devices/virtual/misc/uhid/0005:046D:B397.0002/input/input5
[   44.862009] input: Logi K250 as /devices/virtual/misc/uhid/0005:046D:B397.0002/input/input6
[   44.862056] hid-generic 0005:046D:B397.0002: input,hidraw1: BLUETOOTH HID v0.07 Keyboard [Logi K250] on 5c:84:3c:4f:e5:1e
[   44.879948] usbcore: registered new interface driver usbhid
[   44.879948] usbhid: USB HID core driver
[   45.239061] input: Logitech K250 as /devices/virtual/misc/uhid/0005:046D:B397.0002/input/input8
[   45.239089] logitech-hidpp-device 0005:046D:B397.0002: input,hidraw1: BLUETOOTH HID v0.07 Keyboard [Logitech K250] on 5c:84:3c:4f:e5:1e
[   45.302044] logitech-hidpp-device 0005:046D:B397.0002: HID++ 4.5 device connected.
[  107.319186] wlan: mlan0 START SCAN
[  107.811906] scan_resp_size: Incorrect size of TLV buff size.
[  108.385978] scan_resp_size: Incorrect size of TLV buff size.
[  109.929171] scan_resp_size: Incorrect size of TLV buff size.
[  110.536258] scan_resp_size: Incorrect size of TLV buff size.
[  111.143331] scan_resp_size: Incorrect size of TLV buff size.
[  111.471366] scan_resp_size: Incorrect size of TLV buff size.
[  111.717404] scan_resp_size: Incorrect size of TLV buff size.
[  111.717415] wlan: SCAN COMPLETED: scanned AP count=10
[  111.749400] wlan: HostMlme mlan0 send auth to bssid 06:XX:XX:XX:91:a3
[  111.751421] mlan0: 
[  111.751428] wlan: HostMlme Auth received from 06:XX:XX:XX:91:a3
[  111.760470] wlan: HostMlme mlan0 Connected to bssid 06:XX:XX:XX:91:a3 successfully
[  111.815603] mlan0: 
[  111.815609] wlan: Send EAPOL pkt to 06:XX:XX:XX:91:a3
[  111.835474] mlan0: 
[  111.835476] wlan: Send EAPOL pkt to 06:XX:XX:XX:91:a3
[  111.836731] woal_cfg80211_set_rekey_data return: gtk_rekey_offload is DISABLE

ps5-linux-warm-reboot.sh booted everytime fine for me, jusy BT+wifi had issues and was the only boring thing: linux brings everytime to Wayland, even if some moal crash happens...

Also, I have just the 32GB_USB plugged in the upper rear usb port, noticed kexec failed 2/2 when used another usb disk attached in the second usb port

well, done a couple of tests and things are solid on my end: if I use `ps5-linux-warm-reboot.sh` I also get BT(+le) + wifi correctly back to work; note "WLAN FW already running!" from dmesg, after kexec: ``` [ 0.000000] Linux version 7.2.7-g4ade85 (user@i5-2400) (gcc (GCC) 16.2.1 20260819 (Red Hat 16.2.1-2), GNU ld version 2.46.1-1.fc44) #3 SMP PREEMPT_DYNAMIC Mon Sep 21 20:46:56 CEST 2026 [ 0.000000] Command line: root=LABEL=fedora ro rootwait console=ttyTitania0 console=tty0 mitigations=off idle=halt preempt=full net.ifnames=0 tsc=unstable audit=0 selinux=0 apparmor=0 pci=realloc,pcie_bus_perf ttm.pages_limit=4194304 ... [ 0.222095] xhci_hcd 0000:40:00.6: xHCI Host Controller [ 0.222103] xhci_hcd 0000:40:00.6: new USB bus registered, assigned bus number 1 [ 0.222113] xhci_hcd 0000:40:00.6: spcie not initialized, deferring [ 0.222116] xhci_hcd 0000:40:00.6: can't setup: -517 [ 0.222119] xhci_hcd 0000:40:00.6: USB bus 1 deregistered [ 0.222131] xhci_hcd 0000:40:00.6: init 0000:40:00.6 fail, -517 [ 0.222153] xhci_hcd 0000:20:00.4: xHCI Host Controller [ 0.222157] xhci_hcd 0000:20:00.4: new USB bus registered, assigned bus number 1 [ 0.222248] xhci_hcd 0000:20:00.4: hcc params 0x0260ffed hci version 0x110 quirks 0x0004000000000010 [ 0.222321] xhci_hcd 0000:20:00.4: xHCI Host Controller [ 0.222321] xhci_hcd 0000:20:00.4: new USB bus registered, assigned bus number 2 [ 0.222321] xhci_hcd 0000:20:00.4: Host supports USB 3.1 Enhanced SuperSpeed [ 0.222903] usb usb1: Manufacturer: Linux 7.2.7-g4ade85 xhci-hcd [ 0.222933] usb usb2: Manufacturer: Linux 7.2.7-g4ade85 xhci-hcd [ 0.222949] xhci_hcd 0000:20:00.5: xHCI Host Controller [ 0.222961] xhci_hcd 0000:20:00.5: new USB bus registered, assigned bus number 3 [ 0.223041] xhci_hcd 0000:20:00.5: hcc params 0x0260ffed hci version 0x110 quirks 0x0004000000000010 [ 0.223283] xhci_hcd 0000:20:00.5: xHCI Host Controller [ 0.223287] xhci_hcd 0000:20:00.5: new USB bus registered, assigned bus number 4 [ 0.223290] xhci_hcd 0000:20:00.5: Host supports USB 3.1 Enhanced SuperSpeed [ 0.223327] usb usb3: Manufacturer: Linux 7.2.7-g4ade85 xhci-hcd [ 0.223893] usb usb4: Manufacturer: Linux 7.2.7-g4ade85 xhci-hcd [ 0.545843] usb 2-2: new SuperSpeed USB device number 2 using xhci_hcd [ 2.371653] xhci_hcd 0000:40:00.6: xHCI Host Controller [ 2.373570] xhci_hcd 0000:40:00.6: new USB bus registered, assigned bus number 5 [ 2.379915] xhci_hcd 0000:40:00.6: PS5 Salina xHCI PHY initialized [ 2.380584] xhci_hcd 0000:40:00.6: // Reset the HC on custom Salina Reset [ 2.455248] xhci_hcd 0000:40:00.6: USB0 root hub has no ports [ 2.455334] xhci_hcd 0000:40:00.6: hcc params 0x0228fe6c hci version 0x110 quirks 0x0008800000000010 [ 2.457824] xhci_hcd 0000:40:00.6: Salina: software IRQ poller enabled [ 2.470546] usb usb5: Manufacturer: Linux 7.2.7-g4ade85 xhci-hcd [ 2.717518] usb 5-3: new high-speed USB device number 2 using xhci_hcd ... [ 7.498374] wlan: Register to Bus Driver... [ 7.498374] PCI memory map Virt0: 00000000b5a75f18 PCI memory map Virt2: 00000000454c8e9b [ 7.498374] Attach moal handle ops, card interface type: 0x207 [ 7.498374] rps set to f from module param [ 7.498374] No module param cfg file specified [ 7.498374] rx_work=1 cpu_num=16 [ 7.498374] Enable moal_recv_amsdu_packet [ 7.498374] Attach mlan adapter operations.card_type is 0x207. [ 7.498814] Bluetooth: hci0: unexpected event for opcode 0x0000 [ 7.502055] Request firmware: nxp/pcieuartiw620_combo_v1.bin [ 7.513807] kvm_amd: TSC scaling supported [ 7.513807] kvm_amd: Nested Virtualization enabled [ 7.513807] kvm_amd: Nested Paging enabled [ 7.513807] kvm_amd: LBR virtualization supported [ 7.513807] kvm_amd: Virtual VMLOAD VMSAVE supported [ 7.513807] kvm_amd: Virtual GIF supported [ 7.520165] WLAN FW already running! Skip FW download [ 7.520174] WLAN FW is active [ 7.520176] on_time is 7357886600 [ 7.519807] Bluetooth: hci0: unexpected event for opcode 0x0000 [ 7.521823] fw_cap_info=0x48fcbfa3, dev_cap_mask=0xffffffff [ 7.521823] max_p2p_conn = 0, max_sta_conn = 64 [ 7.523824] IOCTL failed: 00000000323bf22a id=0x200000, sub_id=0x200046 action=1, status_code=0x3 [FW_CMDRESP] [ 7.524190] Register NXP 802.11 Adapter mlan0 [ 7.524190] wlan: version = PCIEIW620-17.130.3.p32--MM6X17542.p8-GPL-(FP92) [ 7.524854] wlan: Register to Bus Driver Done [ 7.524856] wlan: Driver loaded successfully ... [ 8.394124] wlan: Unloading MWLAN driver [ 8.394159] Station already not in enhanced deep sleep mode [ 8.496773] set pending clean [ 8.535736] Free module params [ 8.535788] wlan: Driver unloaded ... [ 8.591063] wlan: Loading MWLAN driver [ 8.591629] wlan: Register to Bus Driver... [ 8.591708] PCI memory map Virt0: 00000000e9d458c0 PCI memory map Virt2: 0000000043e73823 [ 8.591715] Attach moal handle ops, card interface type: 0x207 [ 8.591725] rps set to f from module param [ 8.591727] No module param cfg file specified [ 8.591736] rx_work=1 cpu_num=16 [ 8.591738] Enable moal_recv_amsdu_packet [ 8.591746] Attach mlan adapter operations.card_type is 0x207. [ 8.595784] Request firmware: nxp/pcieuartiw620_combo_v1.bin [ 8.596300] WLAN FW already running! Skip FW download [ 8.596307] WLAN FW is active [ 8.596309] on_time is 8434722896 [ 9.033002] Bluetooth: BNEP (Ethernet Emulation) ver 1.3 [ 9.033008] Bluetooth: BNEP filters: protocol multicast [ 9.033013] Bluetooth: BNEP socket layer initialized ... [ 9.205561] fw_cap_info=0x48fcbfa3, dev_cap_mask=0xffffffff [ 9.205561] max_p2p_conn = 0, max_sta_conn = 64 [ 9.207760] IOCTL failed: 000000004eb9e6fe id=0x200000, sub_id=0x200046 action=1, status_code=0x3 [FW_CMDRESP] [ 9.208643] Register NXP 802.11 Adapter mlan0 [ 9.208643] wlan: version = PCIEIW620-17.130.3.p32--MM6X17542.p8-GPL-(FP92) [ 9.208643] wlan: Register to Bus Driver Done [ 9.208643] wlan: Driver loaded successfully [ 9.221532] IOCTL failed: 00000000793c5e7f id=0x200000, sub_id=0x200046 action=1, status_code=0x3 [FW_CMDRESP] [ 9.254335] [drm] Failed to add display topology, DTM TA is not initialized. [ 10.211687] Bluetooth: MGMT ver 1.23 ... [ 12.578146] input: Logi M196 Mouse as /devices/virtual/misc/uhid/0005:046D:B03F.0001/input/input4 [ 12.578880] hid-generic 0005:046D:B03F.0001: input,hidraw0: BLUETOOTH HID v0.08 Mouse [Logi M196] on 5c:84:3c:4f:e5:1e [ 15.610878] Bluetooth: RFCOMM TTY layer initialized [ 15.610878] Bluetooth: RFCOMM socket layer initialized [ 15.610878] Bluetooth: RFCOMM ver 1.11 [ 20.300048] rfkill: input handler disabled [ 27.525971] pci 0000:00:00.0: ps5_cpu_gov: Unexpected write to kernel-exclusive config offset b8 [ 44.861667] input: Logi K250 Keyboard as /devices/virtual/misc/uhid/0005:046D:B397.0002/input/input5 [ 44.862009] input: Logi K250 as /devices/virtual/misc/uhid/0005:046D:B397.0002/input/input6 [ 44.862056] hid-generic 0005:046D:B397.0002: input,hidraw1: BLUETOOTH HID v0.07 Keyboard [Logi K250] on 5c:84:3c:4f:e5:1e [ 44.879948] usbcore: registered new interface driver usbhid [ 44.879948] usbhid: USB HID core driver [ 45.239061] input: Logitech K250 as /devices/virtual/misc/uhid/0005:046D:B397.0002/input/input8 [ 45.239089] logitech-hidpp-device 0005:046D:B397.0002: input,hidraw1: BLUETOOTH HID v0.07 Keyboard [Logitech K250] on 5c:84:3c:4f:e5:1e [ 45.302044] logitech-hidpp-device 0005:046D:B397.0002: HID++ 4.5 device connected. [ 107.319186] wlan: mlan0 START SCAN [ 107.811906] scan_resp_size: Incorrect size of TLV buff size. [ 108.385978] scan_resp_size: Incorrect size of TLV buff size. [ 109.929171] scan_resp_size: Incorrect size of TLV buff size. [ 110.536258] scan_resp_size: Incorrect size of TLV buff size. [ 111.143331] scan_resp_size: Incorrect size of TLV buff size. [ 111.471366] scan_resp_size: Incorrect size of TLV buff size. [ 111.717404] scan_resp_size: Incorrect size of TLV buff size. [ 111.717415] wlan: SCAN COMPLETED: scanned AP count=10 [ 111.749400] wlan: HostMlme mlan0 send auth to bssid 06:XX:XX:XX:91:a3 [ 111.751421] mlan0: [ 111.751428] wlan: HostMlme Auth received from 06:XX:XX:XX:91:a3 [ 111.760470] wlan: HostMlme mlan0 Connected to bssid 06:XX:XX:XX:91:a3 successfully [ 111.815603] mlan0: [ 111.815609] wlan: Send EAPOL pkt to 06:XX:XX:XX:91:a3 [ 111.835474] mlan0: [ 111.835476] wlan: Send EAPOL pkt to 06:XX:XX:XX:91:a3 [ 111.836731] woal_cfg80211_set_rekey_data return: gtk_rekey_offload is DISABLE ``` `ps5-linux-warm-reboot.sh` booted everytime fine for me, jusy BT+wifi had issues and was the only boring thing: linux brings everytime to Wayland, even if some moal crash happens... Also, I have just the 32GB_USB plugged in the upper rear usb port, noticed kexec failed 2/2 when used another usb disk attached in the second usb port
masterzorag commented 2026-09-23 13:09:18 -05:00 (Migrated from github.com)

xhci seems to break warm reboot via kexec

commit dropped, so we keep xhci disabled;

> xhci seems to break warm reboot via kexec commit dropped, so we keep xhci disabled;
archiver-bot referenced this pull request from a commit 2026-09-29 01:00:16 -05:00
btusb changes for 7.2.5 (#35)
This pull request is broken due to missing fork information.
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin 'masterzorag/7.2.y:masterzorag/7.2.y'
git switch 'masterzorag/7.2.y'

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch 'main'
git merge --no-ff 'masterzorag/7.2.y'
git switch 'masterzorag/7.2.y'
git rebase 'main'
git switch 'main'
git merge --ff-only 'masterzorag/7.2.y'
git switch 'masterzorag/7.2.y'
git rebase 'main'
git switch 'main'
git merge --no-ff 'masterzorag/7.2.y'
git switch 'main'
git merge --squash 'masterzorag/7.2.y'
git switch 'main'
git merge --ff-only 'masterzorag/7.2.y'
git switch 'main'
git merge 'masterzorag/7.2.y'
git push origin 'main'
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
bug
Something isn't working

  
documentation
Improvements or additions to documentation

  
duplicate
This issue or pull request already exists

  
enhancement
New feature or request

  
good first issue
Good for newcomers

  
help wanted
Extra attention is needed

  
invalid
This doesn't seem right

  
question
Further information is requested

  
wontfix
This will not be worked on

No labels
bug
documentation
duplicate
enhancement
good first issue
help wanted
invalid
question
wontfix
Milestone
Clear milestone
No items
No milestone
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set

Reference
gh-ps5-linux/ps5-linux-patches!35
No description provided.