Already applied patches in 7.0-rc2
Just a small thing, but the following patch no longer needs to be included in `0004-fixes.patch` for 7.0-rc2, as it is included in the release candidate. This shouldn't affect much, just breaks my nix build because it's already there and the patching system doesn't allow for skipping.
```
diff --git a/sound/hda/codecs/realtek/alc269.c b/sound/hda/codecs/realtek/alc269.c
index 36053042ca77..fdf688e20bf9 100644
--- a/sound/hda/codecs/realtek/alc269.c
+++ b/sound/hda/codecs/realtek/alc269.c
@@ -6591,6 +6591,7 @@ static const struct hda_quirk alc269_fixup_tbl[] = {
SND_PCI_QUIRK(0x1025, 0x079b, "Acer Aspire V5-573G", ALC282_FIXUP_ASPIRE_V5_PINS),
SND_PCI_QUIRK(0x1025, 0x080d, "Acer Aspire V5-122P", ALC269_FIXUP_ASPIRE_HEADSET_MIC),
SND_PCI_QUIRK(0x1025, 0x0840, "Acer Aspire E1", ALC269VB_FIXUP_ASPIRE_E1_COEF),
+ SND_PCI_QUIRK(0x1025, 0x0943, "Acer Aspire V3-572G", ALC269_FIXUP_ASPIRE_HEADSET_MIC),
SND_PCI_QUIRK(0x1025, 0x100c, "Acer Aspire E5-574G", ALC255_FIXUP_ACER_LIMIT_INT_MIC_BOOST),
SND_PCI_QUIRK(0x1025, 0x101c, "Acer Veriton N2510G", ALC269_FIXUP_LIFEBOOK),
SND_PCI_QUIRK(0x1025, 0x102b, "Acer Aspire C24-860", ALC286_FIXUP_ACER_AIO_MIC_NO_PRESENCE),
--
```
e.g when patching, I get:
```
patching file kernel/sched/fair.c
Hunk #1 succeeded at 12316 (offset 74 lines).
Hunk #2 succeeded at 12368 (offset 74 lines).
Hunk #3 succeeded at 13011 (offset 74 lines).
Hunk #4 succeeded at 13018 (offset 74 lines).
patching file kernel/sched/features.h
patching file kernel/sched/sched.h
patching file kernel/sched/topology.c
patching file sound/hda/codecs/realtek/alc269.c
Reversed (or previously applied) patch detected! Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file sound/hda/codecs/realtek/alc269.c.rej
```
0 条评论