From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Jiri Kosina <jikos@kernel.org>,
Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Masahiro Yamada <yamada.masahiro@socionext.com>,
Jan Kara <jack@suse.cz>
Subject: linux-next: manual merge of the trivial tree with the v4l-dvb tree
Date: Tue, 18 Aug 2015 13:58:10 +1000 [thread overview]
Message-ID: <20150818135810.2eb2dba5@canb.auug.org.au> (raw)
Hi Jiri,
Today's linux-next merge of the trivial tree got a conflict in:
drivers/media/v4l2-core/videobuf2-memops.c
between commit:
6690c8c78c74 ("[media] media: vb2: Remove unused functions")
from the v4l-dvb tree and commit:
e1c05067c323 ("treewide: fix typos in comment blocks")
from the trivial tree.
I fixed it up (the former removed the code modified by the latter)
and can carry the fix as necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
next reply other threads:[~2015-08-18 3:58 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-18 3:58 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2012-02-29 3:33 linux-next: manual merge of the trivial tree with the v4l-dvb tree Stephen Rothwell
2012-03-01 8:28 ` Jiri Kosina
2011-09-27 4:23 Stephen Rothwell
2010-12-28 0:47 Stephen Rothwell
2010-12-28 13:18 ` Jiri Kosina
2010-12-28 0:44 Stephen Rothwell
2010-07-06 5:25 Stephen Rothwell
2010-07-11 20:41 ` Jiri Kosina
2010-07-12 4:15 ` Stephen Rothwell
2009-12-07 4:33 Stephen Rothwell
2009-02-17 8:28 Stephen Rothwell
2009-02-17 11:35 ` Jiri Kosina
2009-02-17 12:24 ` Stephen Rothwell
2009-02-17 13:03 ` Mauro Carvalho Chehab
2009-02-17 13:07 ` Jiri Kosina
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=20150818135810.2eb2dba5@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=jack@suse.cz \
--cc=jikos@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mchehab@osg.samsung.com \
--cc=yamada.masahiro@socionext.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 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).