From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932410AbbEKSef (ORCPT ); Mon, 11 May 2015 14:34:35 -0400 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:34089 "EHLO out4-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932320AbbEKSeb (ORCPT ); Mon, 11 May 2015 14:34:31 -0400 X-Sasl-enc: yPZrlMgIv2+LLcVH0ZJz86wd4NFL3AD+4kqN0jWN+Cjf 1431369269 Date: Mon, 11 May 2015 11:34:28 -0700 From: Greg KH To: Stephen Rothwell Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Wei Yongjun , Hans Verkuil Subject: Re: linux-next: manual merge of the staging tree with the v4l-dvb tree Message-ID: <20150511183428.GB25903@kroah.com> References: <20150511152804.24dffc0a@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20150511152804.24dffc0a@canb.auug.org.au> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, May 11, 2015 at 03:28:04PM +1000, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the staging tree got a conflict in > drivers/staging/media/dt3155v4l/dt3155v4l.c between commit cc11b140c3f1 > ("[media] dt3155: move out of staging into drivers/media/pci") from the > v4l-dvb tree and commit ec80e2428046 ("staging: dt3155v4l: remove > unused including ") from the staging tree (which moved > the file to drivers/media/pci/dt3155/dt3155.c). > > I fixed it up (I just deleted the file from staging - the > linux/config.h patch needs to be applied to the new file) and can carry > the fix as necessary (no action is required). Sounds good, thanks for doing this. greg k-h