lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Sun, 31 Jul 2011 04:11:39 -0400 From: Paul Gortmaker <paul.gortmaker@...driver.com> To: Stephen Rothwell <sfr@...b.auug.org.au> CC: <linux-next@...r.kernel.org>, <linux-kernel@...r.kernel.org>, Ondrej Zary <linux@...nbow-software.org>, Mauro Carvalho Chehab <mchehab@...hat.com> Subject: Re: linux-next: manual merge of the moduleh tree with the v4l-dvb tree [linux-next: manual merge of the moduleh tree with the v4l-dvb tree] On 29/07/2011 (Fri 14:47) Stephen Rothwell wrote: > Hi Paul, > > Today's linux-next merge of the moduleh tree got a conflict in > sound/i2c/other/tea575x-tuner.c between commit 4522e825dbfc ("[media] > tea575x: convert to control framework") from the v4l-dvb tree and commit > a319a4d494d5 ("sound: Add module.h to the previously silent sound users") > from the moduleh tree. > > Just context changes. I fixed it up (see below) anc can carry the fix as > necessary. Seems 4522e825dbfc is in master now, so I've done the fixup locally and you shouldn't see this crop up again. Thanks, Paul. > -- > Cheers, > Stephen Rothwell sfr@...b.auug.org.au > > diff --cc sound/i2c/other/tea575x-tuner.c > index 484a35b,c65c624..0000000 > --- a/sound/i2c/other/tea575x-tuner.c > +++ b/sound/i2c/other/tea575x-tuner.c > @@@ -25,8 -25,9 +25,9 @@@ > #include <linux/init.h> > #include <linux/slab.h> > #include <linux/version.h> > + #include <linux/module.h> > -#include <sound/core.h> > +#include <media/v4l2-dev.h> > +#include <media/v4l2-ioctl.h> > #include <sound/tea575x-tuner.h> > > MODULE_AUTHOR("Jaroslav Kysela <perex@...ex.cz>"); -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists