mirror of
https://git.openwrt.org/openwrt/openwrt.git
synced 2026-02-02 13:13:08 +01:00
738b04c881
Removed upstreamed:
pending-5.15/101-Use-stddefs.h-instead-of-compiler.h.patch[1]
ipq806x/patches-5.15/122-01-clk-qcom-clk-krait-fix-wrong-div2-functions.patch[2]
bcm27xx/patches-5.15/950-0198-drm-fourcc-Add-packed-10bit-YUV-4-2-0-format.patch[3]
Manually rebased:
ramips/patches-5.15/100-PCI-mt7621-Add-MediaTek-MT7621-PCIe-host-controller-.patch[4]
Added patch/backported:
ramips/patches-5.15/107-PCI-mt7621-Add-sentinel-to-quirks-table.patch[5]
All other patches automatically rebased.
1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.86&id=c160505c9b574b346031fdf2c649d19e7939ca11
2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.86&id=a051e10bfc6906d29dae7a31f0773f2702edfe1b
3. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.86&id=ec1727f89ecd6f2252c0c75e200058819f7ce47a
4. Quilt gave this output when I applied the patch to rebase it:
% quilt push -f
Applying patch platform/100-PCI-mt7621-Add-MediaTek-MT7621-PCIe-host-controller-.patch
patching file arch/mips/ralink/Kconfig
patching file drivers/pci/controller/Kconfig
patching file drivers/pci/controller/Makefile
patching file drivers/staging/Kconfig
patching file drivers/staging/Makefile
patching file drivers/staging/mt7621-pci/Kconfig
patching file drivers/staging/mt7621-pci/Makefile
patching file drivers/staging/mt7621-pci/TODO
patching file drivers/staging/mt7621-pci/mediatek,mt7621-pci.txt
patching file drivers/staging/mt7621-pci/pci-mt7621.c
Hunk #1 FAILED at 1.
Not deleting file drivers/staging/mt7621-pci/pci-mt7621.c as content differs from patch
1 out of 1 hunk FAILED -- saving rejects to file drivers/staging/mt7621-pci/pci-mt7621.c.rej
patching file drivers/pci/controller/pcie-mt7621.c
Applied patch platform/100-PCI-mt7621-Add-MediaTek-MT7621-PCIe-host-controller-.patch (forced; needs refresh)
Upon inspecting drivers/staging/mt7621-pci/pci-mt7621.c.rej, it seems that
the original patch wants to delete drivers/staging/mt7621-pci/pci-mt7621.c
but upstream's version was not an exact match. I opted to delete that
file.
5. Suggestion by hauke:
|
||
|---|---|---|
| .. | ||
| 204-module_strip.patch | ||
| 205-kconfig-abort-configuration-on-unset-symbol.patch | ||
| 210-darwin_scripts_include.patch | ||
| 211-darwin-uuid-typedef-clash.patch | ||
| 212-tools_portability.patch | ||
| 214-spidev_h_portability.patch | ||
| 220-arm-gc_sections.patch | ||
| 221-module_exports.patch | ||
| 230-openwrt_lzma_options.patch | ||
| 250-netfilter_depends.patch | ||
| 251-kconfig.patch | ||
| 253-ksmbd-config.patch | ||
| 259-regmap_dynamic.patch | ||
| 260-crypto_test_dependencies.patch | ||
| 261-lib-arc4-unhide.patch | ||
| 280-rfkill-stubs.patch | ||
| 290-net-dsa-mv88e6xxx-depend-on-PTP-conditionally.patch | ||
| 300-MIPS-r4k_cache-use-more-efficient-cache-blast.patch | ||
| 321-powerpc_crtsavres_prereq.patch | ||
| 402-mtd-blktrans-call-add-disks-after-mtd-device.patch | ||
| 410-block-fit-partition-parser.patch | ||
| 420-mtd-support-OpenWrt-s-MTD_ROOTFS_ROOT_DEV.patch | ||
| 421-drivers-mtd-parsers-add-nvmem-support-to-cmdlinepart.patch | ||
| 430-mtk-bmt-support.patch | ||
| 600-bridge_offload.patch | ||
| 601-of_net-add-mac-address-ascii-support.patch | ||
| 645-netfilter-connmark-introduce-set-dscpmark.patch | ||
| 650-netfilter-add-xt_FLOWOFFLOAD-target.patch | ||
| 651-wireless_mesh_header.patch | ||
| 660-fq_codel_defaults.patch | ||
| 661-kernel-ct-size-the-hashtable-more-adequately.patch | ||
| 700-swconfig_switch_drivers.patch | ||
| 711-net-dsa-mv88e6xxx-disable-ATU-violation.patch | ||
| 720-net-phy-add-aqr-phys.patch | ||
| 721-net-add-packet-mangeling.patch | ||
| 722-net-phy-aquantia-enable-AQR112-and-AQR412.patch | ||
| 723-net-phy-aquantia-fix-system-side-protocol-mi.patch | ||
| 724-net-phy-aquantia-Add-AQR113-driver-support.patch | ||
| 725-net-phy-aquantia-add-PHY_IDs-for-AQR112-variants.patch | ||
| 760-net-usb-r8152-add-LED-configuration-from-OF.patch | ||
| 761-dt-bindings-net-add-RTL8152-binding-documentation.patch | ||
| 773-bgmac-add-srab-switch.patch | ||
| 780-usb-net-MeigLink_modem_support.patch | ||
| 790-SFP-GE-T-ignore-TX_FAULT.patch | ||
| 800-GPIO-add-named-gpio-exports.patch | ||
| 901-debloat_sock_diag.patch | ||
| 902-debloat_proc.patch | ||
| 904-debloat_dma_buf.patch | ||
| 910-kobject_uevent.patch | ||
| 911-kobject_add_broadcast_uevent.patch | ||
| 920-device_tree_cmdline.patch | ||
| 930-Revert-Revert-Revert-driver-core-Set-fw_devlink-on-b.patch | ||