From: Sakari Ailus <sakari.ailus@linux.intel.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>, Greg KH <greg@kroah.com>
Cc: Mauro Carvalho Chehab <mchehab@s-opensource.com>,
Mark Brown <broonie@kernel.org>,
Aishwarya Pant <aishpant@gmail.com>,
Branislav Radocaj <branislav@radocaj.org>,
Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: linux-next: manual merge of the staging tree with the media tree
Date: Wed, 15 Nov 2017 01:28:06 +0200 [thread overview]
Message-ID: <20171114232805.vvb5jbpf4fuwkw76@kekkonen.localdomain> (raw)
In-Reply-To: <20171113162433.3ad70a11@canb.auug.org.au>
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
next prev parent reply other threads:[~2017-11-14 23:28 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
2017-11-15 1:25 ` Mauro Carvalho Chehab
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171114232805.vvb5jbpf4fuwkw76@kekkonen.localdomain \
--to=sakari.ailus@linux.intel.com \
--cc=aishpant@gmail.com \
--cc=branislav@radocaj.org \
--cc=broonie@kernel.org \
--cc=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mchehab@s-opensource.com \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).