* The horror is over, but I deleted and forgot some lines - please help
@ 2010-08-05 15:19 Piotr Hosowicz
2010-08-07 13:29 ` Piotr Hosowicz
0 siblings, 1 reply; 2+ messages in thread
From: Piotr Hosowicz @ 2010-08-05 15:19 UTC (permalink / raw)
To: LKML
Hello,
I git-synchronized linux kernel source but it failed to build. I
discovered that the problem is in sound/pci/hda/hda_codec.c . There was
some git specific line of text, so I just deleted it and some other two
lines. It failed again because one of the lines that I just deleted
contained trailing { brace, closing for statement as far as I remember.
Can somebody remind me what had I deleted at first? And how to spot such
situations in the future? I thought that I could write a script to
search and i.e. grep *.c files in the source to catch such coliding
places. But I don't know what should I search.
Reagrds,
Piotr Hosowicz
PS: With working sound ;-)
--
Na przyjęciu chłopak pyta blondynkę:
- Czy mogę cię prosić do walca?
- Zgłupiałeś? To już nie miałeś czym przyjechać?
NP: Peter Green Splinter Group - Turn Your Love Away
NB: 2.6.35-20100805-1436+
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: The horror is over, but I deleted and forgot some lines - please help
2010-08-05 15:19 The horror is over, but I deleted and forgot some lines - please help Piotr Hosowicz
@ 2010-08-07 13:29 ` Piotr Hosowicz
0 siblings, 0 replies; 2+ messages in thread
From: Piotr Hosowicz @ 2010-08-07 13:29 UTC (permalink / raw)
To: LKML
On 05.08.2010 17:19, Piotr Hosowicz wrote:
> Hello,
>
> I git-synchronized linux kernel source but it failed to build. I
> discovered that the problem is in sound/pci/hda/hda_codec.c . There was
> some git specific line of text, so I just deleted it and some other two
> lines. It failed again because one of the lines that I just deleted
> contained trailing { brace, closing for statement as far as I remember.
>
> Can somebody remind me what had I deleted at first? And how to spot such
> situations in the future? I thought that I could write a script to
> search and i.e. grep *.c files in the source to catch such coliding
> places. But I don't know what should I search.
Hello,
Nobody can remind me? What is usually written to the source files when
git failed to sync some files cleanly? I've just built fresh kernel, but
it didn't fail. Or maybe I could provoke this error some way and see
what it writes? I'd like to create a script which I would run after git
pull to search for such files.
Regards,
Piotr Hosowicz
--
Z Allegro: PRZEDMIOTEM AUKCJI JEST NOKIA 6210, ODDAŁEM JA SPEC-
JALISCIE DO WGRANIA JAKIEGOS SOFTU Z NOWYMI BAJERAMI, NO I MAM
BAJER NA WYŚWIETLACZU W POSTACI NAPISU "CONTACT SERVICE".
NP: Peter Green Splinter Group - Tribal Dance
NB: 2.6.35-20100807-1405+
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-08-07 13:29 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-08-05 15:19 The horror is over, but I deleted and forgot some lines - please help Piotr Hosowicz
2010-08-07 13:29 ` Piotr Hosowicz
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).