[PATCH 00/49] V4L/DVB updates part 2

[PATCH 00/49] V4L/DVB updates part 2

[mchehab]

This patch series is available under v4l-dvb.git tree at:
        kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git.

To avoid a patchbomb traffic at the lists, I'll not send this time
all those emails to the list. Instead, please check at the tree.

Linus, please pull these from master branch.

It contains the following stuff:

   - This patch fixes Tuner TNF5335 family
   - Nskips maybe used uninitialized in bttv_risc_overlay
   - Fix cx88 error messages on balance change
   - Updated CARDLIST.tuner with newer tenna string
   - Correct gpio values for Aver 303 Studio in v4l-dvb tree
   - Remove 'pid' from struct dmxdev_filter
   - Remove 'dvbdev' from struct dmxdev_filter
   - Fix typo in enum name and use enum in struct dmxdev_filter
   - Optical cleanup for dmxdev.c
   - Added no_overlay option and quirks to saa7134
   - Thomson FE6600: add missing "count" array element
   - Saa7134: small whitespace cleanup
   - LG TALN series: add PAL / SECAM support
   - Saa7134: add support for AVerMedia A169 Dual Analog tuner card
   - Cx88-cards.c: fix values of gpio0 for card CX88_BOARD_PROLINK_PLAYTVPVR
   - Cx88-input.c: add IR remote control support to CX88_BOARD_PROLINK_PLAYTVPVR
   - Cx88 default picture controls values
   - Cleanup mangled whitespace
   - Make dvb_ringbuffer compatible to dmxdev_buffer
   - BUG_ON() Conversion in drivers/video/media
   - Snd_cx88_create: don't dereference NULL core
   - Kconfig: select VIDEO_CX25840 to build cx25840 a/v decoder module
   - Cpia2: move Kconfig build logic into cpia2/Kconfig
   - Remove redundant makefile inclusion of tuner.o
   - Fix a bug when more than MAXBOARDS were plugged on em28xx
   - Ringbuffer: don't reset pointers to zero
   - Dmxdev: use dvb_ringbuffer
   - Saa7134: make unsupported secondary decoder message generic
   - Whitespace: fix incorrect indentation of curly bracket
   - Medion 7134: Autodetect second bridge chip
   - Cinergy T2 dmx cleanup on disconnect
   - Make a needlessly global function static.
   - Remove saa711x driver
   - SAA7113 doesn't have auto std chroma detection mode
   - Avoid warnings at video-buf.c
   - Fixed a trouble with other PAL standards
   - Kconfig: select VIDEO_MSP3400 to build msp3400.ko
   - Kconfig: add menu items for saa7115 and saa7127
   - Kconfig: remove VIDEO_DECODER
   - VIDEO_CPIA2 must depend on USB
   - Kconfig: fix ATSC frontend menu item names by manufacturer
   - Kconfig: add menu items for cs53l32a and wm8775 A/D converters
   - Kconfig: remove VIDEO_AUDIO_DECODER
   - Moved duplicated code of ALPS BSRU6 tuner to a standalone file.
   - Add WSS (wide screen signalling) module parameters
   - Whitespace cleanup
   - Bt8xx documentation update
   - Fix Makefile to adapt to bt8xx/ conversion
   - Fixed no_overlay option and quirks on saa7134 driver

Cheers,
Mauro.

V4L/DVB development is hosted at http://linuxtv.org
Development Mercurial trees are available at http://linuxtv.org/hg
---

 Documentation/dvb/bt8xx.txt                       |  143 --
 Documentation/video4linux/CARDLIST.saa7134        |    3 
 Documentation/video4linux/CARDLIST.tuner          |    4 
 drivers/media/common/saa7146_core.c               |    3 
 drivers/media/common/saa7146_fops.c               |    6 
 drivers/media/dvb/bt8xx/Makefile                  |    2 
 drivers/media/dvb/cinergyT2/cinergyT2.c           |    4 
 drivers/media/dvb/dvb-core/dmxdev.c               |  830 ++++++--------
 drivers/media/dvb/dvb-core/dmxdev.h               |   22 
 drivers/media/dvb/dvb-core/dvb_ringbuffer.c       |    6 
 drivers/media/dvb/dvb-core/dvb_ringbuffer.h       |    1 
 drivers/media/dvb/frontends/Kconfig               |    6 
 drivers/media/dvb/frontends/bsru6.h               |  140 ++
 drivers/media/dvb/frontends/zl10353.c             |    2 
 drivers/media/dvb/ttpci/av7110.c                  |  123 --
 drivers/media/dvb/ttpci/av7110_v4l.c              |   11 
 drivers/media/dvb/ttpci/budget-ci.c               |  118 -
 drivers/media/dvb/ttpci/budget-patch.c            |   99 -
 drivers/media/dvb/ttpci/budget.c                  |   98 -
 drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c |    3 
 drivers/media/video/Kconfig                       |   90 -
 drivers/media/video/Makefile                      |   18 
 drivers/media/video/bttv-cards.c                  |   10 
 drivers/media/video/bttv-risc.c                   |    5 
 drivers/media/video/cpia2/Kconfig                 |   11 
 drivers/media/video/cx25840/Kconfig               |    9 
 drivers/media/video/cx25840/Makefile              |    2 
 drivers/media/video/cx88/cx88-alsa.c              |   10 
 drivers/media/video/cx88/cx88-cards.c             |   23 
 drivers/media/video/cx88/cx88-core.c              |    3 
 drivers/media/video/cx88/cx88-input.c             |    1 
 drivers/media/video/cx88/cx88-video.c             |   17 
 drivers/media/video/cx88/cx88.h                   |    2 
 drivers/media/video/dpc7146.c                     |   58 
 drivers/media/video/em28xx/Kconfig                |    1 
 drivers/media/video/em28xx/em28xx-video.c         |  220 ---
 drivers/media/video/hexium_gemini.c               |   10 
 drivers/media/video/hexium_orion.c                |   18 
 drivers/media/video/mxb.c                         |  146 +-
 drivers/media/video/mxb.h                         |    2 
 drivers/media/video/saa7115.c                     |  125 +-
 drivers/media/video/saa7134/saa7134-alsa.c        |    3 
 drivers/media/video/saa7134/saa7134-cards.c       |   91 +
 drivers/media/video/saa7134/saa7134-core.c        |   37 
 drivers/media/video/saa7134/saa7134-oss.c         |    6 
 drivers/media/video/saa7134/saa7134-video.c       |   30 
 drivers/media/video/saa7134/saa7134.h             |    4 
 drivers/media/video/tda9840.c                     |    3 
 drivers/media/video/tea6415c.c                    |    5 
 drivers/media/video/tea6420.c                     |    5 
 drivers/media/video/tuner-simple.c                |    3 
 drivers/media/video/tuner-types.c                 |   58 
 drivers/media/video/video-buf.c                   |   17 
 include/media/tuner.h                             |    2 
 include/media/v4l2-common.h                       |    1 
 55 files changed, 1205 insertions(+), 1465 deletions(-)

Re: [PATCH 00/49] V4L/DVB updates part 2

[Linus Torvalds]

On Mon, 20 Mar 2006, mchehab@infradead.org wrote:
>
> This patch series is available under v4l-dvb.git tree at:
>         kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git.

Mauro,
 because this tree contained a really ugly failed merge that was 
incorrectly done as a commit that was just a diff, I re-wrote the tree by 
re-doing the merge properly (as far as I can tell) and then cherry-picking 
the commits that followed it.

This means that what I just pushed out has the same _contents_ as your 
tree had, but because it has a fixed-up history, it's really a different 
tree.

I'm hoping that you can just discard your broken tree, and replace it with 
mine. So _instead_ of doing a "git pull" on my tree (which will succeed 
fine, but which will leave you with your old broken history _and_ the new 
fixed up one), you should just reset your state to mine.

If you have some additional commits on top of your broken history, you can 
cherry-pick them onto the fixed one. Ok?

I'd suggest you double-check that my result is sensible, but I was pretty 
careful. It should be all good (the end result matches your end result 
exactly), but also, the history should be identical apart from the merge 
mess being cleaned up.

(If it's not clear how to reset to my state, just do something like

    git fetch origin		# get my new updated tree
    git branch oldbranch	# save your old state in "oldbranch"
    git reset --hard origin	# switch your master branch over to "origin"

which will reset your state to mine, and leave your old state in the 
"oldbranch" branch - after that, you can look at both "oldbranch" and the 
current state, and perhaps move any commits on "oldbranch" over to the new 
state with "git cherry-pick <cmit-id>").

Holler if you have any issues..

(Oh: when next you push to master.kernel.org, you'll need to use the "-f" 
flag to _force_ the push, since your new tree will no longer be a superset 
of your old broken tree with the broken merge).

		Linus