linux-next: manual merge of the trivial tree with the v4l-dvb tree
in [Kernel]
|
Prev: USB HID DRIVERS: Enable HID_QUIRK_MULTI_INPUT for Retro Adaptor
Next: HID: picolcd: fix deferred_io init/cleanup to (un)register_framebuffer ordering
From: Jiri Kosina on 11 Jul 2010 16:50 On Tue, 6 Jul 2010, Stephen Rothwell wrote: > Hi Jiri, > > Today's linux-next merge of the trivial tree got a conflict in > drivers/media/video/ov511.c between commit > b2bde15c455d09057dc7bd9f5b9ed67b9ac99b8a ("V4L/DVB: Remove obsolete ov511 > driver") from the v4l-dvb tree and commit > 421f91d21ad6f799dc7b489bb33cc560ccc56f98 ("fix typos concerning "initiali > [zs]e"") from the trivial tree. > > The former just removes the file, so I removed it. Hi Stephen, thanks for reporting it, I have reverted the drivers/media/video/ov511.c hunk. -- Jiri Kosina SUSE Labs, Novell Inc. -- 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: Stephen Rothwell on 12 Jul 2010 00:20
Hi Jiri, On Sun, 11 Jul 2010 22:41:48 +0200 (CEST) Jiri Kosina <jkosina(a)suse.cz> wrote: > > thanks for reporting it, I have reverted the drivers/media/video/ov511.c > hunk. Thanks. -- Cheers, Stephen Rothwell sfr(a)canb.auug.org.au http://www.canb.auug.org.au/~sfr/ |