Hans Verkuil wrote: > The following changes since commit daf9fe2ee9a203c4fc555cfe5c5f3d9f660e743c: > Linus Torvalds (1): > Merge branch 'for-linus' of git://git.kernel.org/.../sameo/mfd-2.6 > > are available in the git repository at: > > ssh://linuxtv.org/git/hverkuil/v4l-dvb.git misc-fixes > > Hans Verkuil (3): > videobuf-core: fix spelling mistake in debug message. > v4l doc: fix font of field name > v4l2: sort chip IDs in v4l2-chip-ident.h > > Michael Hunold (1): > saa7146: fix up bytesperline if it is an impossible value > > Documentation/DocBook/v4l/vidioc-reqbufs.xml | 2 +- > drivers/media/common/saa7146_video.c | 8 +- > drivers/media/video/videobuf-core.c | 2 +- > include/media/v4l2-chip-ident.h | 120 +++++++++++++------------ > 4 files changed, 69 insertions(+), 63 deletions(-) > Hans, Didn't work. You should add your patches after the "master" branch of my tree, and not after upstream "master". So, if you're sending me patches against the development tree, you should use v4l-dvb.git currently, upstream 2.6.33 + V4L/DVB). If you're sending me fixes patches, please use fixes.git (currently, 2.6.34-rc1). Cheers, Mauro. --- $ gitimport ssh://linuxtv.org/git/hverkuil/v4l-dvb.git misc-fixes git checkout -b misc-fixes_tmp work Switched to a new branch 'misc-fixes_tmp' git pull ssh://linuxtv.org/git/hverkuil/v4l-dvb.git misc-fixes remote: Counting objects: 70234, done. remote: Compressing objects: 100% (12013/12013), done. remote: Total 57195 (delta 47167), reused 53957 (delta 44076) Receiving objects: 100% (57195/57195), 14.56 MiB | 53 KiB/s, done. Resolving deltas: 100% (47167/47167), completed with 6840 local objects. >From ssh://linuxtv.org/git/hverkuil/v4l-dvb * branch misc-fixes -> FETCH_HEAD warning: too many files (created: 900 deleted: 332), skipping inexact rename detection CONFLICT (content): Merge conflict in Documentation/DocBook/v4l/vidioc-reqbufs.xml CONFLICT (content): Merge conflict in drivers/media/IR/ir-keymaps.c CONFLICT (content): Merge conflict in drivers/media/IR/ir-keytable.c CONFLICT (add/add): Merge conflict in drivers/media/IR/ir-sysfs.c CONFLICT (content): Merge conflict in drivers/media/dvb/dm1105/dm1105.c CONFLICT (content): Merge conflict in drivers/media/dvb/dvb-usb/af9015.c CONFLICT (add/add): Merge conflict in drivers/media/dvb/dvb-usb/az6027.c CONFLICT (content): Merge conflict in drivers/media/dvb/dvb-usb/dvb-usb-ids.h CONFLICT (content): Merge conflict in drivers/media/dvb/frontends/stv090x.c CONFLICT (content): Merge conflict in drivers/media/dvb/frontends/stv6110x.c CONFLICT (content): Merge conflict in drivers/media/dvb/mantis/mantis_input.c CONFLICT (add/add): Merge conflict in drivers/media/dvb/ngene/ngene-core.c CONFLICT (content): Merge conflict in drivers/media/dvb/ttpci/budget-ci.c CONFLICT (content): Merge conflict in drivers/media/video/bt8xx/bttv-input.c CONFLICT (content): Merge conflict in drivers/media/video/cx231xx/cx231xx-input.c CONFLICT (content): Merge conflict in drivers/media/video/cx23885/cx23885-input.c CONFLICT (content): Merge conflict in drivers/media/video/cx88/cx88-dvb.c CONFLICT (content): Merge conflict in drivers/media/video/cx88/cx88-input.c CONFLICT (add/add): Merge conflict in drivers/media/video/davinci/isif_regs.h CONFLICT (content): Merge conflict in drivers/media/video/em28xx/em28xx-cards.c CONFLICT (content): Merge conflict in drivers/media/video/em28xx/em28xx-dvb.c CONFLICT (content): Merge conflict in drivers/media/video/em28xx/em28xx-input.c CONFLICT (add/add): Merge conflict in drivers/media/video/gspca/cpia1.c CONFLICT (content): Merge conflict in drivers/media/video/gspca/ov534.c CONFLICT (add/add): Merge conflict in drivers/media/video/gspca/sn9c2028.c CONFLICT (content): Merge conflict in drivers/media/video/ir-kbd-i2c.c CONFLICT (content): Merge conflict in drivers/media/video/saa7134/saa7134-input.c CONFLICT (add/add): Merge conflict in drivers/media/video/tlg2300/pd-dvb.c CONFLICT (add/add): Merge conflict in drivers/media/video/tlg2300/pd-main.c CONFLICT (add/add): Merge conflict in drivers/media/video/tlg2300/pd-radio.c CONFLICT (add/add): Merge conflict in drivers/media/video/tlg2300/pd-video.c CONFLICT (content): Merge conflict in drivers/mfd/Kconfig CONFLICT (content): Merge conflict in drivers/mfd/Makefile CONFLICT (content): Merge conflict in include/media/ir-core.h CONFLICT (content): Merge conflict in include/media/v4l2-chip-ident.h Recorded preimage for 'Documentation/DocBook/v4l/vidioc-reqbufs.xml' Recorded preimage for 'drivers/media/IR/ir-keymaps.c' Recorded preimage for 'drivers/media/IR/ir-keytable.c' Recorded preimage for 'drivers/media/IR/ir-sysfs.c' Recorded preimage for 'drivers/media/dvb/dm1105/dm1105.c' Recorded preimage for 'drivers/media/dvb/dvb-usb/af9015.c' Recorded preimage for 'drivers/media/dvb/dvb-usb/az6027.c' Recorded preimage for 'drivers/media/dvb/dvb-usb/dvb-usb-ids.h' Recorded preimage for 'drivers/media/dvb/frontends/stv090x.c' Recorded preimage for 'drivers/media/dvb/frontends/stv6110x.c' Recorded preimage for 'drivers/media/dvb/mantis/mantis_input.c' Recorded preimage for 'drivers/media/dvb/ngene/ngene-core.c' Recorded preimage for 'drivers/media/dvb/ttpci/budget-ci.c' Recorded preimage for 'drivers/media/video/bt8xx/bttv-input.c' Recorded preimage for 'drivers/media/video/cx231xx/cx231xx-input.c' Recorded preimage for 'drivers/media/video/cx23885/cx23885-input.c' Recorded preimage for 'drivers/media/video/cx88/cx88-dvb.c' Recorded preimage for 'drivers/media/video/cx88/cx88-input.c' Recorded preimage for 'drivers/media/video/davinci/isif_regs.h' Recorded preimage for 'drivers/media/video/em28xx/em28xx-cards.c' Recorded preimage for 'drivers/media/video/em28xx/em28xx-input.c' Recorded preimage for 'drivers/media/video/gspca/cpia1.c' Recorded preimage for 'drivers/media/video/gspca/ov534.c' Recorded preimage for 'drivers/media/video/gspca/sn9c2028.c' Recorded preimage for 'drivers/media/video/ir-kbd-i2c.c' Recorded preimage for 'drivers/media/video/saa7134/saa7134-input.c' Recorded preimage for 'drivers/media/video/tlg2300/pd-dvb.c' Recorded preimage for 'drivers/media/video/tlg2300/pd-main.c' Recorded preimage for 'drivers/media/video/tlg2300/pd-radio.c' Recorded preimage for 'drivers/media/video/tlg2300/pd-video.c' Recorded preimage for 'drivers/mfd/Kconfig' Recorded preimage for 'drivers/mfd/Makefile' Recorded preimage for 'include/media/ir-core.h' Recorded preimage for 'include/media/v4l2-chip-ident.h' Automatic merge failed; fix conflicts and then commit the result. Error 0. Please fix. -- Cheers, Mauro -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
