From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Mauro Carvalho Chehab <mchehab@osg•samsung.com>,
Arnd Bergmann <arnd@arndb•de>
Cc: Linux-Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Hans Verkuil <hans.verkuil@cisco•com>
Subject: linux-next: manual merge of the v4l-dvb tree with the asm-generic tree
Date: Thu, 15 Mar 2018 12:29:21 +1100 [thread overview]
Message-ID: <20180315122921.24520368@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 790 bytes --]
Hi Mauro,
Today's linux-next merge of the v4l-dvb tree got a conflict in:
drivers/media/platform/blackfin/bfin_capture.c
between commit:
b9ec40bf7d29 ("media: platform: remove blackfin capture driver")
from the asm-generic tree and commit:
4471109e3894 ("media: convert g/s_parm to g/s_frame_interval in subdevs")
from the v4l-dvb tree.
I fixed it up (I just removed the file) 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.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2018-03-15 1:29 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-15 1:29 Stephen Rothwell [this message]
2018-04-03 23:09 ` linux-next: manual merge of the v4l-dvb tree with the asm-generic tree Stephen Rothwell
2018-04-04 9:41 ` 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=20180315122921.24520368@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=arnd@arndb$(echo .)de \
--cc=hans.verkuil@cisco$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mchehab@osg$(echo .)samsung.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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