From: Greg KH <greg@kroah.com>
To: Mark Brown <broonie@kernel.org>
Cc: Aishwarya Pant <aishpant@gmail.com>,
Branislav Radocaj <branislav@radocaj.org>,
Sakari Ailus <sakari.ailus@linux.intel.com>,
Mauro Carvalho Chehab <mchehab@s-opensource.com>,
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: Mon, 9 Oct 2017 21:05:32 +0200 [thread overview]
Message-ID: <20171009190532.GA4335@kroah.com> (raw)
In-Reply-To: <20171009182653.5phanxtnwwtrx34e@sirena.co.uk>
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? :(
next prev parent reply other threads:[~2017-10-09 19:05 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 [this message]
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
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=20171009190532.GA4335@kroah.com \
--to=greg@kroah.com \
--cc=aishpant@gmail.com \
--cc=branislav@radocaj.org \
--cc=broonie@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mchehab@s-opensource.com \
--cc=sakari.ailus@linux.intel.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.