From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751986AbbHRD6O (ORCPT ); Mon, 17 Aug 2015 23:58:14 -0400 Received: from ozlabs.org ([103.22.144.67]:54793 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751271AbbHRD6M (ORCPT ); Mon, 17 Aug 2015 23:58:12 -0400 Date: Tue, 18 Aug 2015 13:58:10 +1000 From: Stephen Rothwell To: Jiri Kosina , Mauro Carvalho Chehab Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Masahiro Yamada , Jan Kara Subject: linux-next: manual merge of the trivial tree with the v4l-dvb tree Message-ID: <20150818135810.2eb2dba5@canb.auug.org.au> 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: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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