Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1209026
| Path | csiph.com!eternal-september.org!feeder.eternal-september.org!aioe.org!bofh.it!news.nic.it!robomod |
|---|---|
| From | Stephen Rothwell <sfr@canb.auug.org.au> |
| Newsgroups | linux.kernel |
| Subject | linux-next: manual merge of the trivial tree with the v4l-dvb tree |
| Date | Tue, 18 Aug 2015 06:00:01 +0200 |
| Message-ID | <pYGe5-2Tz-1@gated-at.bofh.it> (permalink) |
| X-Original-To | Jiri Kosina <jikos@kernel.org>, Mauro Carvalho Chehab <mchehab@osg.samsung.com> |
| X-Mailer | Claws Mail 3.11.1 (GTK+ 2.24.28; x86_64-pc-linux-gnu) |
| MIME-Version | 1.0 |
| Content-Type | text/plain; charset=US-ASCII |
| Content-Transfer-Encoding | 7bit |
| Sender | robomod@news.nic.it |
| List-ID | <linux-kernel.vger.kernel.org> |
| X-Mailing-List | linux-kernel@vger.kernel.org |
| Approved | robomod@news.nic.it |
| Lines | 27 |
| Organization | linux.* mail to news gateway |
| X-Original-Cc | linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Masahiro Yamada <yamada.masahiro@socionext.com>, Jan Kara <jack@suse.cz> |
| X-Original-Date | Tue, 18 Aug 2015 13:58:10 +1000 |
| X-Original-Message-ID | <20150818135810.2eb2dba5@canb.auug.org.au> |
| X-Original-Sender | linux-kernel-owner@vger.kernel.org |
| Xref | csiph.com linux.kernel:1209026 |
Show key headers only | View 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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Back to linux.kernel | Previous | Next | Find similar | Unroll thread
linux-next: manual merge of the trivial tree with the v4l-dvb tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-08-18 06:00 +0200
csiph-web