linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* linux-next: manual merge of the staging tree with the v4l-dvb tree
@ 2011-03-04  5:39 Stephen Rothwell
  2011-03-04 17:13 ` Greg KH
  0 siblings, 1 reply; 13+ messages in thread
From: Stephen Rothwell @ 2011-03-04  5:39 UTC (permalink / raw)
  To: Greg KH
  Cc: linux-next, linux-kernel, Alan Cox, Igor M. Liplianin,
	Mauro Carvalho Chehab

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/Kconfig between commit
a1256092a1e87511c977a3d0ef96151cda77e5c9 ("[media] Altera FPGA firmware
download module") from the v4l-dvb tree and commit
0867b42113ec4eb8646eb361b15cbcfb741ddf5b ("staging: gma500: Intel GMA500
staging driver") from the staging tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/staging/Kconfig
index 1ae0c1b,5295d85..0000000
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@@ -179,7 -177,7 +177,9 @@@ source "drivers/staging/cptm1217/Kconfi
  
  source "drivers/staging/ste_rmi4/Kconfig"
  
 +source "drivers/staging/altera-stapl/Kconfig"
 +
+ source "drivers/staging/gma500/Kconfig"
+ 
  endif # !STAGING_EXCLUDE_BUILD
  endif # STAGING

^ permalink raw reply	[flat|nested] 13+ messages in thread

end of thread, other threads:[~2011-03-10  8:24 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-03-04  5:39 linux-next: manual merge of the staging tree with the v4l-dvb tree Stephen Rothwell
2011-03-04 17:13 ` Greg KH
2011-03-04 17:54   ` Mauro Carvalho Chehab
2011-03-04 21:23     ` Greg KH
2011-03-04 22:17       ` Mauro Carvalho Chehab
2011-03-07 14:07     ` Kernelspace firmware loaders (was: linux-next: manual merge of the staging tree with the v4l-dvb tree) Laurent Pinchart
2011-03-07 16:16       ` Greg KH
2011-03-07 16:39         ` Linus Torvalds
2011-03-09 22:30           ` Laurent Pinchart
2011-03-10  8:14             ` Olivier Galibert
2011-03-07 16:51         ` Laurent Pinchart
2011-03-07 17:40           ` Igor M. Liplianin
2011-03-09 22:11             ` Laurent Pinchart

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).