Re: [PULL] http://linuxtv.org/hg/~endriss/ngene
Oliver Endriss wrote: > On Sunday 25 April 2010 15:42:54 Mauro Carvalho Chehab wrote: >> Oliver Endriss wrote: >>> On Sunday 21 March 2010 21:15:01 Oliver Endriss wrote: Mauro, Please pull from http://linuxtv.org/hg/~endriss/ngene for the following changeset: 01/01: ngene: Workaround for stuck DiSEqC pin http://linuxtv.org/hg/~endriss/ngene?cmd=changeset;node=1dc562463f63 stv090x.c |4 1 file changed, 4 insertions(+) Thanks, Oliver >>> Ping! >> This patch were already merged on my fixes.git tree: >> >> commit 492c3a4e8749e70b2f981d600bc29a1798963ff9 >> Author: Oliver Endriss >> AuthorDate: Sun Mar 21 11:48:47 2010 -0300 >> Commit: Mauro Carvalho Chehab >> CommitDate: Thu Apr 1 12:58:29 2010 -0300 >> >> V4L/DVB: ngene: Workaround for stuck DiSEqC pin >> >> Send one DiSEqC byte to make sure that the pin is set to low level. >> >> >> It is not on the development tree yet (so, it were not added to the >> -hg tree). >> >> The rationale is that this patch should go first to upstream tree, and then, >> when merging again from Linus, it will appear at the development tree. >> >> However: if we backport from Linus right now, we'll move from a stable >> revision (2.6.33) to a non-stable random upstream version. I'm avoiding >> to do it, since, every time we merge back, a full compilation is required >> for those that are using git. On the other hand, if we simply add the >> patch at -git, it will appear again when submitting the development tree >> upstream. >> >> So, we basically need some ideas on how to improve the process without >> those issues . I have a few ideas about it (probably adding some branches >> at the tree), but I need first to work on my long queue of patches, in order >> to have some time to work on it. > > Well, my understanding of a proper software development process is: > (1) Patch goes to the master development trees. > (2) Patch will (hopefully) get more testing. > (3) Patch should go upstream. > > If we have to wait for patches to be applied upstream, > the master development trees are pointless... I agree, but replacing the engines of a supersonic jet while it is still flying is not an easy task. -- Cheers, Mauro -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PULL] http://linuxtv.org/hg/~endriss/ngene
On Sunday 25 April 2010 15:42:54 Mauro Carvalho Chehab wrote: > Oliver Endriss wrote: > > On Sunday 21 March 2010 21:15:01 Oliver Endriss wrote: > >> Mauro, > >> > >> Please pull from http://linuxtv.org/hg/~endriss/ngene > >> > >> for the following changeset: > >> > >> 01/01: ngene: Workaround for stuck DiSEqC pin > >> http://linuxtv.org/hg/~endriss/ngene?cmd=changeset;node=1dc562463f63 > >> > >> > >> stv090x.c |4 > >> 1 file changed, 4 insertions(+) > >> > >> Thanks, > >> Oliver > > > > Ping! > > This patch were already merged on my fixes.git tree: > > commit 492c3a4e8749e70b2f981d600bc29a1798963ff9 > Author: Oliver Endriss > AuthorDate: Sun Mar 21 11:48:47 2010 -0300 > Commit: Mauro Carvalho Chehab > CommitDate: Thu Apr 1 12:58:29 2010 -0300 > > V4L/DVB: ngene: Workaround for stuck DiSEqC pin > > Send one DiSEqC byte to make sure that the pin is set to low level. > > > It is not on the development tree yet (so, it were not added to the > -hg tree). > > The rationale is that this patch should go first to upstream tree, and then, > when merging again from Linus, it will appear at the development tree. > > However: if we backport from Linus right now, we'll move from a stable > revision (2.6.33) to a non-stable random upstream version. I'm avoiding > to do it, since, every time we merge back, a full compilation is required > for those that are using git. On the other hand, if we simply add the > patch at -git, it will appear again when submitting the development tree > upstream. > > So, we basically need some ideas on how to improve the process without > those issues . I have a few ideas about it (probably adding some branches > at the tree), but I need first to work on my long queue of patches, in order > to have some time to work on it. Well, my understanding of a proper software development process is: (1) Patch goes to the master development trees. (2) Patch will (hopefully) get more testing. (3) Patch should go upstream. If we have to wait for patches to be applied upstream, the master development trees are pointless... CU Oliver -- VDR Remote Plugin 0.4.0: http://www.escape-edv.de/endriss/vdr/ 4 MByte Mod: http://www.escape-edv.de/endriss/dvb-mem-mod/ Full-TS Mod: http://www.escape-edv.de/endriss/dvb-full-ts-mod/ -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PULL] http://linuxtv.org/hg/~endriss/ngene
Oliver Endriss wrote: > On Sunday 21 March 2010 21:15:01 Oliver Endriss wrote: >> Mauro, >> >> Please pull from http://linuxtv.org/hg/~endriss/ngene >> >> for the following changeset: >> >> 01/01: ngene: Workaround for stuck DiSEqC pin >> http://linuxtv.org/hg/~endriss/ngene?cmd=changeset;node=1dc562463f63 >> >> >> stv090x.c |4 >> 1 file changed, 4 insertions(+) >> >> Thanks, >> Oliver > > Ping! This patch were already merged on my fixes.git tree: commit 492c3a4e8749e70b2f981d600bc29a1798963ff9 Author: Oliver Endriss AuthorDate: Sun Mar 21 11:48:47 2010 -0300 Commit: Mauro Carvalho Chehab CommitDate: Thu Apr 1 12:58:29 2010 -0300 V4L/DVB: ngene: Workaround for stuck DiSEqC pin Send one DiSEqC byte to make sure that the pin is set to low level. It is not on the development tree yet (so, it were not added to the -hg tree). The rationale is that this patch should go first to upstream tree, and then, when merging again from Linus, it will appear at the development tree. However: if we backport from Linus right now, we'll move from a stable revision (2.6.33) to a non-stable random upstream version. I'm avoiding to do it, since, every time we merge back, a full compilation is required for those that are using git. On the other hand, if we simply add the patch at -git, it will appear again when submitting the development tree upstream. So, we basically need some ideas on how to improve the process without those issues . I have a few ideas about it (probably adding some branches at the tree), but I need first to work on my long queue of patches, in order to have some time to work on it. -- Cheers, Mauro PS.: I haven't submitted the fixes tree upstream yet. Some patches at the devel tree also need to go to fixes, but the same problem happens with those patches: we should not send a patch twice to upstream. So, my hope is to merge the pending patches this weekend and do some process changes next week to allow me to submit those upstream. -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PULL] http://linuxtv.org/hg/~endriss/ngene
On Sat, Apr 24, 2010 at 10:56 AM, Oliver Endriss wrote: > Ok, drop the last two patches. I will resubmit them after Devin's > patch set has been applied. > > Oliver Thanks Oliver. I've got over a hundred patches queued up behind this series, so I am obviously pretty concerned about merge conflicts. In fact, Steven may have already taken care of the issue with certain operations occurring during the IRQ handler (I would have to double check to be sure though, he reworked large amounts of that logic). Cheers, Devin -- Devin J. Heitmueller - Kernel Labs http://www.kernellabs.com -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PULL] http://linuxtv.org/hg/~endriss/ngene
On Saturday 24 April 2010 16:33:09 Devin Heitmueller wrote: > On Sat, Apr 24, 2010 at 10:29 AM, Oliver Endriss wrote: > > On Wednesday 21 April 2010 04:14:11 Oliver Endriss wrote: > >> On Sunday 21 March 2010 21:15:01 Oliver Endriss wrote: > >> > Mauro, > >> > > >> > Please pull from http://linuxtv.org/hg/~endriss/ngene > >> > > >> > for the following changeset: > >> > > >> > 01/01: ngene: Workaround for stuck DiSEqC pin > >> > http://linuxtv.org/hg/~endriss/ngene?cmd=changeset;node=1dc562463f63 > >> > > >> > > >> > stv090x.c | 4 > >> > 1 file changed, 4 insertions(+) > >> > > >> > Thanks, > >> > Oliver > > > > Added two more changesets: > > > > Please pull from http://endr...@linuxtv.org/hg/~endriss/ngene > > > > for the following 3 changesets: > > > > 01/03: ngene: Workaround for stuck DiSEqC pin > > http://endr...@linuxtv.org/hg/~endriss/ngene?cmd=changeset;node=1dc562463f63 > > > > 02/03: ngene: Support new device 'Digital Devices DuoFlex S2 miniPCIe' > > http://endr...@linuxtv.org/hg/~endriss/ngene?cmd=changeset;node=aa7f03d11744 > > > > 03/03: ngene: Do not call demuxer with interrupts disabled > > http://endr...@linuxtv.org/hg/~endriss/ngene?cmd=changeset;node=a5ff8f64d1f7 > > > > > > frontends/stv090x.c | 4 > > ngene/ngene-core.c | 35 +-- > > 2 files changed, 29 insertions(+), 10 deletions(-) > > > > CU > > Oliver > > Mauro, > > Where are we at with pulling my other ngene changeset? The whole > reason I submitted it so early was to avoid merge conflicts with > patches such as this. Ok, drop the last two patches. I will resubmit them after Devin's patch set has been applied. Oliver -- VDR Remote Plugin 0.4.0: http://www.escape-edv.de/endriss/vdr/ 4 MByte Mod: http://www.escape-edv.de/endriss/dvb-mem-mod/ Full-TS Mod: http://www.escape-edv.de/endriss/dvb-full-ts-mod/ -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PULL] http://linuxtv.org/hg/~endriss/ngene
On Sat, Apr 24, 2010 at 10:29 AM, Oliver Endriss wrote: > On Wednesday 21 April 2010 04:14:11 Oliver Endriss wrote: >> On Sunday 21 March 2010 21:15:01 Oliver Endriss wrote: >> > Mauro, >> > >> > Please pull from http://linuxtv.org/hg/~endriss/ngene >> > >> > for the following changeset: >> > >> > 01/01: ngene: Workaround for stuck DiSEqC pin >> > http://linuxtv.org/hg/~endriss/ngene?cmd=changeset;node=1dc562463f63 >> > >> > >> > stv090x.c | 4 >> > 1 file changed, 4 insertions(+) >> > >> > Thanks, >> > Oliver > > Added two more changesets: > > Please pull from http://endr...@linuxtv.org/hg/~endriss/ngene > > for the following 3 changesets: > > 01/03: ngene: Workaround for stuck DiSEqC pin > http://endr...@linuxtv.org/hg/~endriss/ngene?cmd=changeset;node=1dc562463f63 > > 02/03: ngene: Support new device 'Digital Devices DuoFlex S2 miniPCIe' > http://endr...@linuxtv.org/hg/~endriss/ngene?cmd=changeset;node=aa7f03d11744 > > 03/03: ngene: Do not call demuxer with interrupts disabled > http://endr...@linuxtv.org/hg/~endriss/ngene?cmd=changeset;node=a5ff8f64d1f7 > > > frontends/stv090x.c | 4 > ngene/ngene-core.c | 35 +-- > 2 files changed, 29 insertions(+), 10 deletions(-) > > CU > Oliver Mauro, Where are we at with pulling my other ngene changeset? The whole reason I submitted it so early was to avoid merge conflicts with patches such as this. Devin -- Devin J. Heitmueller - Kernel Labs http://www.kernellabs.com -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PULL] http://linuxtv.org/hg/~endriss/ngene
On Wednesday 21 April 2010 04:14:11 Oliver Endriss wrote: > On Sunday 21 March 2010 21:15:01 Oliver Endriss wrote: > > Mauro, > > > > Please pull from http://linuxtv.org/hg/~endriss/ngene > > > > for the following changeset: > > > > 01/01: ngene: Workaround for stuck DiSEqC pin > > http://linuxtv.org/hg/~endriss/ngene?cmd=changeset;node=1dc562463f63 > > > > > > stv090x.c |4 > > 1 file changed, 4 insertions(+) > > > > Thanks, > > Oliver Added two more changesets: Please pull from http://endr...@linuxtv.org/hg/~endriss/ngene for the following 3 changesets: 01/03: ngene: Workaround for stuck DiSEqC pin http://endr...@linuxtv.org/hg/~endriss/ngene?cmd=changeset;node=1dc562463f63 02/03: ngene: Support new device 'Digital Devices DuoFlex S2 miniPCIe' http://endr...@linuxtv.org/hg/~endriss/ngene?cmd=changeset;node=aa7f03d11744 03/03: ngene: Do not call demuxer with interrupts disabled http://endr...@linuxtv.org/hg/~endriss/ngene?cmd=changeset;node=a5ff8f64d1f7 frontends/stv090x.c |4 ngene/ngene-core.c | 35 +-- 2 files changed, 29 insertions(+), 10 deletions(-) CU Oliver -- VDR Remote Plugin 0.4.0: http://www.escape-edv.de/endriss/vdr/ 4 MByte Mod: http://www.escape-edv.de/endriss/dvb-mem-mod/ Full-TS Mod: http://www.escape-edv.de/endriss/dvb-full-ts-mod/ -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PULL] http://linuxtv.org/hg/~endriss/ngene
On Sunday 21 March 2010 21:15:01 Oliver Endriss wrote: > Mauro, > > Please pull from http://linuxtv.org/hg/~endriss/ngene > > for the following changeset: > > 01/01: ngene: Workaround for stuck DiSEqC pin > http://linuxtv.org/hg/~endriss/ngene?cmd=changeset;node=1dc562463f63 > > > stv090x.c |4 > 1 file changed, 4 insertions(+) > > Thanks, > Oliver Ping! CU Oliver -- VDR Remote Plugin 0.4.0: http://www.escape-edv.de/endriss/vdr/ 4 MByte Mod: http://www.escape-edv.de/endriss/dvb-mem-mod/ Full-TS Mod: http://www.escape-edv.de/endriss/dvb-full-ts-mod/ -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PULL] http://linuxtv.org/hg/~endriss/ngene
Mauro, Please pull from http://linuxtv.org/hg/~endriss/ngene for the following changeset: 01/01: ngene: Workaround for stuck DiSEqC pin http://linuxtv.org/hg/~endriss/ngene?cmd=changeset;node=1dc562463f63 stv090x.c |4 1 file changed, 4 insertions(+) Thanks, Oliver -- VDR Remote Plugin 0.4.0: http://www.escape-edv.de/endriss/vdr/ 4 MByte Mod: http://www.escape-edv.de/endriss/dvb-mem-mod/ Full-TS Mod: http://www.escape-edv.de/endriss/dvb-full-ts-mod/ -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
