| Message ID | 20240404100048.819674-1-oswald.buddenhagen@gmx.de (mailing list archive) |
|---|---|
| Headers | show |
| Series | ALSA: emu10k1 & emux: fixes related to wavetable playback | expand |
On Thu, 04 Apr 2024 12:00:31 +0200, Oswald Buddenhagen wrote: > > --- > This patch series needs to be applied on top of the patch titled > "Revert "ALSA: emu10k1: fix synthesizer sample playback position and > caching"". The patch set isn't cleanly applicable even after the revert patch. The patch 7 fails. Please rebase to the latest for-linus branch and resubmit. thanks, Takashi > > Oswald Buddenhagen (17): > ALSA: emux: fix /proc teardown at module unload > ALSA: emux: prune unused parameter from snd_soundfont_load_guspatch() > ALSA: emux: fix validation of snd_emux.num_ports > ALSA: emux: fix init of patch_info.truesize in load_data() > ALSA: emu10k1: prune vestiges of > SNDRV_SFNT_SAMPLE_{BIDIR,REVERSE}_LOOP support > ALSA: emux: centralize & improve patch info validation > ALSA: emux: improve patch ioctl data validation > ALSA: emu10k1: move patch loader assertions into low-level functions > ALSA: emu10k1: fix sample signedness issues in wavetable loader > ALSA: emu10k1: fix playback of 8-bit wavetable samples > ALSA: emu10k1: merge conditions in patch loader > ALSA: emu10k1: fix wavetable offset recalculation > ALSA: emu10k1: de-duplicate size calculations for 16-bit samples > ALSA: emu10k1: improve cache behavior documentation > ALSA: emu10k1: fix wavetable playback position and caching, take 2 > ALSA: emu10k1: shrink blank space in front of wavetable samples > ALSA: emux: simplify snd_sf_list.callback handling > > include/sound/emu10k1.h | 32 +++-- > include/sound/soundfont.h | 2 +- > sound/isa/sb/emu8000_patch.c | 13 -- > sound/pci/emu10k1/emu10k1_callback.c | 13 +- > sound/pci/emu10k1/emu10k1_patch.c | 207 +++++++++++---------------- > sound/pci/emu10k1/memory.c | 55 +++++-- > sound/synth/emux/emux.c | 6 +- > sound/synth/emux/emux_hwdep.c | 3 +- > sound/synth/emux/emux_oss.c | 3 +- > sound/synth/emux/emux_proc.c | 1 + > sound/synth/emux/emux_seq.c | 6 +- > sound/synth/emux/soundfont.c | 73 +++++++--- > 12 files changed, 219 insertions(+), 195 deletions(-) > > > base-commit: ed93395844979f6bf2e1fbfcda38d1718289b426 > prerequisite-patch-id: b7769e1c8649b86fd9e0b259e11bfd8e468393e5 > -- > 2.42.0.419.g70bf8a5751 >
On Fri, Apr 05, 2024 at 11:20:32AM +0200, Takashi Iwai wrote: >On Thu, 04 Apr 2024 12:00:31 +0200, >Oswald Buddenhagen wrote: >> >> --- >> This patch series needs to be applied on top of the patch titled >> "Revert "ALSA: emu10k1: fix synthesizer sample playback position and >> caching"". > >The patch set isn't cleanly applicable even after the revert patch. >The patch 7 fails. > >Please rebase to the latest for-linus branch and resubmit. > this makes no sense; i'm getting a bit-identical patch after the rebase (which is unsurprising, as the file in question wasn't touched in years). are you sure you didn't corrupt the patch somehow (it happened before, cf. summary of c960b012ec47)? or maybe you have an unpublished conflicting commit? if there is an actual problem and you just named the wrong patch, then i suspect that it's just git-am being stupid - the rebases from 6.8 and later from your master from about a week ago went through smoothly.
On Fri, 05 Apr 2024 12:07:57 +0200, Oswald Buddenhagen wrote: > > On Fri, Apr 05, 2024 at 11:20:32AM +0200, Takashi Iwai wrote: > > On Thu, 04 Apr 2024 12:00:31 +0200, > > Oswald Buddenhagen wrote: > >> > >> --- > >> This patch series needs to be applied on top of the patch titled > >> "Revert "ALSA: emu10k1: fix synthesizer sample playback position and > >> caching"". > > > > The patch set isn't cleanly applicable even after the revert patch. > > The patch 7 fails. > > > > Please rebase to the latest for-linus branch and resubmit. > > > this makes no sense; i'm getting a bit-identical patch after the rebase > (which is unsurprising, as the file in question wasn't touched in > years). > > are you sure you didn't corrupt the patch somehow (it happened before, > cf. summary of c960b012ec47)? or maybe you have an unpublished > conflicting commit? > > if there is an actual problem and you just named the wrong patch, then i > suspect that it's just git-am being stupid - the rebases from 6.8 and > later from your master from about a week ago went through smoothly. No, I used b4 at this time, and such a failure shouldn't happen. Try by yourself to apply the submitted patch mails with git-am on the latest for-linus (or master) branch. thanks, Takashi
On Fri, Apr 05, 2024 at 12:29:25PM +0200, Takashi Iwai wrote: >Try by yourself to apply the submitted patch mails with git-am on the >latest for-linus (or master) branch. > ok, the problem is indeed patch corruption, but it's not your fault. trailing tabs got stripped from the patches in flight. while my reading of https://www.rfc-editor.org/rfc/rfc5321#section-2.3.10 is that MTAs may not just strip trailing whitespace, the ones i tried apparently do. somebody may want to verify that ... anyway, you can still apply the patches by adding --ignore-whitespace to git-am's command line. if the process doesn't permit that, i'll re-post after convincing git-send-email to apply quoted-printable content-transfer-encoding to ensure preservation of trailing whitespace.
On Fri, 05 Apr 2024 20:38:22 +0200, Oswald Buddenhagen wrote: > > On Fri, Apr 05, 2024 at 12:29:25PM +0200, Takashi Iwai wrote: > > Try by yourself to apply the submitted patch mails with git-am on the > > latest for-linus (or master) branch. > > > ok, the problem is indeed patch corruption, but it's not your fault. > trailing tabs got stripped from the patches in flight. > > while my reading of > https://www.rfc-editor.org/rfc/rfc5321#section-2.3.10 is that MTAs may > not just strip trailing whitespace, the ones i tried apparently do. > somebody may want to verify that ... > > anyway, you can still apply the patches by adding --ignore-whitespace to > git-am's command line. > > if the process doesn't permit that, i'll re-post after convincing > git-send-email to apply quoted-printable content-transfer-encoding to > ensure preservation of trailing whitespace. Yes, please resubmit with the correct content. All the original posts are archived and may be used to check for the correctness of the patches later. thanks, Takashi
--- This patch series needs to be applied on top of the patch titled "Revert "ALSA: emu10k1: fix synthesizer sample playback position and caching"". Oswald Buddenhagen (17): ALSA: emux: fix /proc teardown at module unload ALSA: emux: prune unused parameter from snd_soundfont_load_guspatch() ALSA: emux: fix validation of snd_emux.num_ports ALSA: emux: fix init of patch_info.truesize in load_data() ALSA: emu10k1: prune vestiges of SNDRV_SFNT_SAMPLE_{BIDIR,REVERSE}_LOOP support ALSA: emux: centralize & improve patch info validation ALSA: emux: improve patch ioctl data validation ALSA: emu10k1: move patch loader assertions into low-level functions ALSA: emu10k1: fix sample signedness issues in wavetable loader ALSA: emu10k1: fix playback of 8-bit wavetable samples ALSA: emu10k1: merge conditions in patch loader ALSA: emu10k1: fix wavetable offset recalculation ALSA: emu10k1: de-duplicate size calculations for 16-bit samples ALSA: emu10k1: improve cache behavior documentation ALSA: emu10k1: fix wavetable playback position and caching, take 2 ALSA: emu10k1: shrink blank space in front of wavetable samples ALSA: emux: simplify snd_sf_list.callback handling include/sound/emu10k1.h | 32 +++-- include/sound/soundfont.h | 2 +- sound/isa/sb/emu8000_patch.c | 13 -- sound/pci/emu10k1/emu10k1_callback.c | 13 +- sound/pci/emu10k1/emu10k1_patch.c | 207 +++++++++++---------------- sound/pci/emu10k1/memory.c | 55 +++++-- sound/synth/emux/emux.c | 6 +- sound/synth/emux/emux_hwdep.c | 3 +- sound/synth/emux/emux_oss.c | 3 +- sound/synth/emux/emux_proc.c | 1 + sound/synth/emux/emux_seq.c | 6 +- sound/synth/emux/soundfont.c | 73 +++++++--- 12 files changed, 219 insertions(+), 195 deletions(-) base-commit: ed93395844979f6bf2e1fbfcda38d1718289b426 prerequisite-patch-id: b7769e1c8649b86fd9e0b259e11bfd8e468393e5 -- 2.42.0.419.g70bf8a5751