* linux-next: manual merge of the staging tree with the media tree
@ 2017-10-09 18:26 Mark Brown
2017-10-09 19:05 ` Greg KH
2017-11-13 5:24 ` Stephen Rothwell
0 siblings, 2 replies; 6+ messages in thread
From: Mark Brown @ 2017-10-09 18:26 UTC (permalink / raw)
To: Greg KH, Aishwarya Pant, Branislav Radocaj, Sakari Ailus,
Mauro Carvalho Chehab
Cc: Linux-Next Mailing List, Linux Kernel Mailing List
[-- Attachment #1: Type: text/plain, Size: 756 bytes --]
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 ("atomisp2: remove cast from memory allocation")
from the staging tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: manual merge of the staging tree with the media tree
2017-10-09 18:26 linux-next: manual merge of the staging tree with the media tree Mark Brown
@ 2017-10-09 19:05 ` Greg KH
2017-10-09 19:12 ` Mark Brown
2017-11-13 5:24 ` Stephen Rothwell
1 sibling, 1 reply; 6+ messages in thread
From: Greg KH @ 2017-10-09 19:05 UTC (permalink / raw)
To: Mark Brown
Cc: Aishwarya Pant, Branislav Radocaj, Sakari Ailus,
Mauro Carvalho Chehab, Linux-Next Mailing List,
Linux Kernel Mailing List
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 alloc_cast.cocci warnings")
>
> from the media tree and commit:
>
> 4d962df5a7771 ("atomisp2: remove cast from memory allocation")
>
> from the staging tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
What fix? :(
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: manual merge of the staging tree with the media tree
2017-10-09 19:05 ` Greg KH
@ 2017-10-09 19:12 ` Mark Brown
0 siblings, 0 replies; 6+ messages in thread
From: Mark Brown @ 2017-10-09 19:12 UTC (permalink / raw)
To: Greg KH
Cc: Aishwarya Pant, Branislav Radocaj, Sakari Ailus,
Mauro Carvalho Chehab, Linux-Next Mailing List,
Linux Kernel Mailing List
[-- Attachment #1: Type: text/plain, Size: 127 bytes --]
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.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: manual merge of the staging tree with the media tree
2017-10-09 18:26 linux-next: manual merge of the staging tree with the media tree Mark Brown
2017-10-09 19:05 ` Greg KH
@ 2017-11-13 5:24 ` Stephen Rothwell
2017-11-14 23:28 ` Sakari Ailus
1 sibling, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2017-11-13 5:24 UTC (permalink / raw)
To: Greg KH, Mauro Carvalho Chehab
Cc: Mark Brown, Aishwarya Pant, Branislav Radocaj, Sakari Ailus,
Linux-Next Mailing List, Linux Kernel Mailing List
Hi all,
On Mon, 9 Oct 2017 19:26:54 +0100 Mark Brown <broonie@kernel.org> 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 alloc_cast.cocci warnings")
>
> from the media tree and commit:
>
> 4d962df5a7771 ("atomisp2: remove cast from memory allocation")
>
> from the staging tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
Just a reminder that this conflict still exists.
--
Cheers,
Stephen Rothwell
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: manual merge of the staging tree with the media tree
2017-11-13 5:24 ` Stephen Rothwell
@ 2017-11-14 23:28 ` Sakari Ailus
2017-11-15 1:25 ` Mauro Carvalho Chehab
0 siblings, 1 reply; 6+ messages in thread
From: Sakari Ailus @ 2017-11-14 23:28 UTC (permalink / raw)
To: Stephen Rothwell, Greg KH
Cc: Mauro Carvalho Chehab, Mark Brown, Aishwarya Pant,
Branislav Radocaj, Linux-Next Mailing List,
Linux Kernel Mailing List
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 <broonie@kernel.org> 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 alloc_cast.cocci warnings")
> >
> > from the media tree and commit:
> >
> > 4d962df5a7771 ("atomisp2: remove cast from memory allocation")
> >
> > from the staging tree.
> >
> > I fixed it up (see below) and can carry the fix as necessary. This
> > is now fixed as far as linux-next is concerned, but any non trivial
> > conflicts should be mentioned to your upstream maintainer when your tree
> > is submitted for merging. You may also want to consider cooperating
> > with the maintainer of the conflicting tree to minimise any particularly
> > complex conflicts.
>
> Just a reminder that this conflict still exists.
Both patches essentially contain the same change, the difference is in the
indentation only. There's a number of atomisp patches in the media tree,
how about simply reverting the patch in the staging tree?
--
Regards,
Sakari Ailus
sakari.ailus@linux.intel.com
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: manual merge of the staging tree with the media tree
2017-11-14 23:28 ` Sakari Ailus
@ 2017-11-15 1:25 ` Mauro Carvalho Chehab
0 siblings, 0 replies; 6+ messages in thread
From: Mauro Carvalho Chehab @ 2017-11-15 1:25 UTC (permalink / raw)
To: Sakari Ailus
Cc: Stephen Rothwell, Greg KH, Mark Brown, Aishwarya Pant,
Branislav Radocaj, Linux-Next Mailing List,
Linux Kernel Mailing List
Em Wed, 15 Nov 2017 01:28:06 +0200
Sakari Ailus <sakari.ailus@linux.intel.com> 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 <broonie@kernel.org> 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 alloc_cast.cocci warnings")
> > >
> > > from the media tree and commit:
> > >
> > > 4d962df5a7771 ("atomisp2: remove cast from memory allocation")
> > >
> > > from the staging tree.
> > >
> > > I fixed it up (see below) and can carry the fix as necessary. This
> > > is now fixed as far as linux-next is concerned, but any non trivial
> > > conflicts should be mentioned to your upstream maintainer when your tree
> > > is submitted for merging. You may also want to consider cooperating
> > > with the maintainer of the conflicting tree to minimise any particularly
> > > complex conflicts.
> >
> > Just a reminder that this conflict still exists.
>
> Both patches essentially contain the same change, the difference is in the
> indentation only. There's a number of atomisp patches in the media tree,
> how about simply reverting the patch in the staging tree?
Today morning I merged the changeset from staging tree that Greg
sent to Linux (and that was already merged upstream), solving the conflict.
So, except if something else pops up, the conflict at -next will
cease to exist after it gets merged back there :-)
Regards,
Mauro
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-11-15 1:25 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-10-09 18:26 linux-next: manual merge of the staging tree with the media tree Mark Brown
2017-10-09 19:05 ` Greg KH
2017-10-09 19:12 ` Mark Brown
2017-11-13 5:24 ` Stephen Rothwell
2017-11-14 23:28 ` Sakari Ailus
2017-11-15 1:25 ` Mauro Carvalho Chehab
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).