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: Sat, 27 Apr 2019 08:36:46 +0200 From: Greg KH <greg@...ah.com> To: Stephen Rothwell <sfr@...b.auug.org.au> Cc: Mauro Carvalho Chehab <mchehab@...nel.org>, Linux Next Mailing List <linux-next@...r.kernel.org>, Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, Hans Verkuil <hverkuil-cisco@...all.nl>, Cristiano Borges Cardoso <cristianoborgescardoso@...il.com>, Nishka Dasgupta <nishka.dasgupta@...oo.com>, Sanjana Sanikommu <sanjana99reddy99@...il.com>, Vatsala Narang <vatsalanarang@...il.com>, Bhanusree Pola <bhanusreemahesh@...il.com>, Himadri Pandya <himadri18.07@...il.com>, Jules Irenge <jbi.octave@...il.com> Subject: Re: linux-next: manual merge of the staging tree with the v4l-dvb tree On Fri, Apr 26, 2019 at 04:06:58PM +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the staging tree got conflicts in: > > drivers/staging/media/zoran/Kconfig > drivers/staging/media/zoran/videocodec.c > drivers/staging/media/zoran/videocodec.h > drivers/staging/media/zoran/zoran.h > drivers/staging/media/zoran/zoran_card.c > drivers/staging/media/zoran/zoran_card.h > drivers/staging/media/zoran/zoran_device.c > drivers/staging/media/zoran/zoran_device.h > drivers/staging/media/zoran/zoran_driver.c > drivers/staging/media/zoran/zoran_procfs.c > drivers/staging/media/zoran/zoran_procfs.h > drivers/staging/media/zoran/zr36016.c > drivers/staging/media/zoran/zr36016.h > drivers/staging/media/zoran/zr36050.c > drivers/staging/media/zoran/zr36050.h > drivers/staging/media/zoran/zr36057.h > drivers/staging/media/zoran/zr36060.c > drivers/staging/media/zoran/zr36060.h > > between commit: > > 8dce4b265a53 ("media: zoran: remove deprecated driver") > > from the v4l-dvb tree and various commits from the staging tree. Yeah! glad the driver is now gone, sorry for the merge issues. greg k-h
Powered by blists - more mailing lists