Re: linux-next: manual merge of the staging tree with the media tree

2017-11-14 Thread Mauro Carvalho Chehab
Em Wed, 15 Nov 2017 01:28:06 +0200 Sakari Ailus escreveu: > Hi Stephen, Greg, others, > > On Mon, Nov 13, 2017 at 04:24:47PM +1100, Stephen Rothwell wrote: > > Hi all, > > > > On Mon, 9 Oct 2017 19:26:54 +0100 Mark Brown wrote: > > > > > >

Re: linux-next: manual merge of the staging tree with the media tree

2017-11-14 Thread Mauro Carvalho Chehab
Em Wed, 15 Nov 2017 01:28:06 +0200 Sakari Ailus escreveu: > Hi Stephen, Greg, others, > > On Mon, Nov 13, 2017 at 04:24:47PM +1100, Stephen Rothwell wrote: > > Hi all, > > > > On Mon, 9 Oct 2017 19:26:54 +0100 Mark Brown wrote: > > > > > > Hi Greg, > > > > > > Today's linux-next merge of

Re: linux-next: manual merge of the staging tree with the media tree

2017-11-14 Thread Sakari Ailus
Hi Stephen, Greg, others, On Mon, Nov 13, 2017 at 04:24:47PM +1100, Stephen Rothwell wrote: > Hi all, > > On Mon, 9 Oct 2017 19:26:54 +0100 Mark Brown wrote: > > > > Hi Greg, > > > > Today's linux-next merge of the staging tree got a conflict in: > > > >

Re: linux-next: manual merge of the staging tree with the media tree

2017-11-14 Thread Sakari Ailus
Hi Stephen, Greg, others, On Mon, Nov 13, 2017 at 04:24:47PM +1100, Stephen Rothwell wrote: > Hi all, > > On Mon, 9 Oct 2017 19:26:54 +0100 Mark Brown wrote: > > > > Hi Greg, > > > > Today's linux-next merge of the staging tree got a conflict in: > > > >

Re: linux-next: manual merge of the staging tree with the media tree

2017-11-12 Thread Stephen Rothwell
Hi all, On Mon, 9 Oct 2017 19:26:54 +0100 Mark Brown wrote: > > Hi Greg, > > Today's linux-next merge of the staging tree got a conflict in: > > drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_firmware.c > > between commit: > >866af46e6ebbc ("media:

Re: linux-next: manual merge of the staging tree with the media tree

2017-11-12 Thread Stephen Rothwell
Hi all, On Mon, 9 Oct 2017 19:26:54 +0100 Mark Brown wrote: > > Hi Greg, > > Today's linux-next merge of the staging tree got a conflict in: > > drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_firmware.c > > between commit: > >866af46e6ebbc ("media: Staging: atomisp: fix

Re: linux-next: manual merge of the staging tree with the media tree

2017-10-09 Thread Mark Brown
On Mon, Oct 09, 2017 at 09:05:32PM +0200, Greg KH wrote: > What fix? :( It's a null diff, the change isn't needed any more. signature.asc Description: PGP signature

Re: linux-next: manual merge of the staging tree with the media tree

2017-10-09 Thread Mark Brown
On Mon, Oct 09, 2017 at 09:05:32PM +0200, Greg KH wrote: > What fix? :( It's a null diff, the change isn't needed any more. signature.asc Description: PGP signature

Re: linux-next: manual merge of the staging tree with the media tree

2017-10-09 Thread Greg KH
On Mon, Oct 09, 2017 at 07:26:54PM +0100, Mark Brown wrote: > Hi Greg, > > Today's linux-next merge of the staging tree got a conflict in: > > drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_firmware.c > > between commit: > >866af46e6ebbc ("media: Staging: atomisp: fix

Re: linux-next: manual merge of the staging tree with the media tree

2017-10-09 Thread Greg KH
On Mon, Oct 09, 2017 at 07:26:54PM +0100, Mark Brown wrote: > Hi Greg, > > Today's linux-next merge of the staging tree got a conflict in: > > drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_firmware.c > > between commit: > >866af46e6ebbc ("media: Staging: atomisp: fix

linux-next: manual merge of the staging tree with the media tree

2017-10-09 Thread Mark Brown
Hi Greg, Today's linux-next merge of the staging tree got a conflict in: drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_firmware.c between commit: 866af46e6ebbc ("media: Staging: atomisp: fix alloc_cast.cocci warnings") from the media tree and commit: 4d962df5a7771

linux-next: manual merge of the staging tree with the media tree

2017-10-09 Thread Mark Brown
Hi Greg, Today's linux-next merge of the staging tree got a conflict in: drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_firmware.c between commit: 866af46e6ebbc ("media: Staging: atomisp: fix alloc_cast.cocci warnings") from the media tree and commit: 4d962df5a7771