mirror of
https://github.com/openwrt/openwrt.git
synced 2025-01-18 10:46:41 +00: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:
|
||
---|---|---|
.. | ||
site | ||
autotools.mk | ||
bpf.mk | ||
cmake.mk | ||
debug.mk | ||
depends.mk | ||
device_table.txt | ||
download.mk | ||
feeds.mk | ||
hardened-ld-pie.specs | ||
hardening.mk | ||
host-build.mk | ||
image-commands.mk | ||
image.mk | ||
kernel-5.10 | ||
kernel-5.15 | ||
kernel-build.mk | ||
kernel-defaults.mk | ||
kernel-version.mk | ||
kernel.mk | ||
logo.png | ||
logo.svg | ||
meson.mk | ||
netfilter.mk | ||
nls.mk | ||
openssl-engine.mk | ||
package-bin.mk | ||
package-defaults.mk | ||
package-dumpinfo.mk | ||
package-ipkg.mk | ||
package-seccomp.mk | ||
package.mk | ||
prereq-build.mk | ||
prereq.mk | ||
quilt.mk | ||
rootfs.mk | ||
scan.awk | ||
scan.mk | ||
shell.sh | ||
subdir.mk | ||
target.mk | ||
toolchain-build.mk | ||
toplevel.mk | ||
trusted-firmware-a.mk | ||
u-boot.mk | ||
uclibc++.mk | ||
unpack.mk | ||
verbose.mk | ||
version.mk |