Prev: [PATCH 2/3] powerpc: implement arch_setup_pdev_archdata
Next: [PATCH 1/3] memstick: init sysfs attributes
From: Piotr Hosowicz on 5 Aug 2010 11:30
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+
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
From: Piotr Hosowicz on 7 Aug 2010 09:40
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+
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: [PATCH 2/3] powerpc: implement arch_setup_pdev_archdata
Next: [PATCH 1/3] memstick: init sysfs attributes