From: Jaroslav Kysela <perex@perex.cz>
To: "Brand, Mark (Mr) (Summerstrand Campus South)" <Mark.Brand@nmmu.ac.za>
Cc: "'alsa-devel@alsa-project.org'" <alsa-devel@alsa-project.org>
Subject: Re: gitcompile fails
Date: Fri, 20 Jul 2012 13:38:02 +0200 [thread overview]
Message-ID: <5009431A.6060102@perex.cz> (raw)
In-Reply-To: <35FE09CFAB387A4BA7ACDDED49F34518167D15@CRETE.nmmu.ac.za>
Date 20.7.2012 12:30, Brand, Mark (Mr) (Summerstrand Campus South) wrote:
> Fresh (yesterday?) git clones of alsa-driver and alsa-kmirror produce a ./gitcompile failure for me:
>
> copying file alsa-kernel/pci/hda/hda_beep.c
> patching file hda_beep.c
> Hunk #2 succeeded at 96 (offset 1 line).
> Hunk #3 succeeded at 124 (offset 1 line).
> Hunk #4 succeeded at 142 (offset 1 line).
> Hunk #5 succeeded at 164 (offset 1 line).
> Hunk #6 FAILED at 282.
> 1 out of 6 hunks FAILED -- saving rejects to file hda_beep.c.rej
> make[2]: *** [hda_beep.c] Error 1
> make[2]: Leaving directory `/home/mark/workspace/alsa-driver/pci/hda'
> make[1]: *** [prepare] Error 1
> make[1]: Leaving directory `/home/mark/workspace/alsa-driver/pci'
> make: *** [dep] Error 1
>
> My best guess is that there is a version mismatch between the alsa-kernel/pci/hda/hda_beep.c (linked to alsa-kmirror) and pci/hda/hda_beep.patch files, since the patch seems to refer to a non-existent line-number in my source. Any suggestions will be much appreciated, thank you.
It should be fixed now. Thank for this notice.
Jaroslav
--
Jaroslav Kysela <perex@perex.cz>
Linux Kernel Sound Maintainer
ALSA Project; Red Hat, Inc.
next prev parent reply other threads:[~2012-07-20 11:37 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-20 10:30 gitcompile fails Brand, Mark (Mr) (Summerstrand Campus South)
2012-07-20 10:50 ` Takashi Iwai
2012-07-20 11:38 ` Jaroslav Kysela [this message]
-- strict thread matches above, loose matches on Subject: below --
2014-06-03 14:20 Mark Brand
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5009431A.6060102@perex.cz \
--to=perex@perex.cz \
--cc=Mark.Brand@nmmu.ac.za \
--cc=alsa-devel@alsa-project.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox