From: Jean-Francois Moine <moinejf@free.fr>
To: Mauro Carvalho Chehab <mchehab@redhat.com>
Cc: linux-media@vger.kernel.org
Subject: Which GIT repository for 2.6.35/2.6.36
Date: Thu, 3 Jun 2010 10:39:47 +0200 [thread overview]
Message-ID: <20100603103947.4458bac3@tele> (raw)
Hi Mauro,
I am lost with the GIT repositories at LinuxTv.org.
My local development repository is based on
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
origin and git://linuxtv.org/v4l-dvb.git master
When moving any local branch, the kernel is 2.6.33.
Looking at 'origin/HEAD', the kernel is 2.6.34.
Then, looking at http://git.linuxtv.org/linux-2.6.git, the kernel is
2.6.35-rc1.
A problem appeared when some gspca testers signalled compilation errors
with kernels 2.6.34. Looking more carefuly, I see that, in the file
drivers/media/video/gspca/zc3xx.c
there is no
#include <linux/slab.h>
in the local branches, nor in v4l-dvb master, while it exists in
v4l-dvb devel/for_v2.6.34.
Looking at http://git.linuxtv.org/linux-2.6.git, I see that there is a
recent change about the files slab.h et gfp.h (commit
5a0e3ad6af8660be21ca98a971cd00f331318c05) which touches gspca files
again.
I do not think I will put anything more in the new kernel (2.6.35),
but what with 2.6.36? Some gspca files have been changed in kernels
2.6.34 and 2.6.35, and these changes don't appear in the v4l-dvb
repository. What can I do?
- if I continue to develop with v4l-dvb, there will be permanent merge
problems with the future kernel.
- if I base my local repository directly on the last 2.6.35, there will
be problems with v4l-dvb.
Otherwise, at LinuxTv.org, is there any development repository in sync
with both the last kernel and the video stuff?
Cheers.
--
Ken ar c'hentañ | ** Breizh ha Linux atav! **
Jef | http://moinejf.free.fr/
next reply other threads:[~2010-06-03 8:38 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-03 8:39 Jean-Francois Moine [this message]
2010-06-03 14:56 ` Which GIT repository for 2.6.35/2.6.36 Mauro Carvalho Chehab
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=20100603103947.4458bac3@tele \
--to=moinejf@free.fr \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@redhat.com \
/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