From patchwork Sat Jul 18 04:51:03 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent McIntyre X-Patchwork-Id: 30590 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1ZGK5u-0005na-Mn; Sat, 18 Jul 2015 06:51:26 +0200 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.76/mailfrontend-5) with esmtp id 1ZGK5s-0005JU-7Q; Sat, 18 Jul 2015 06:51:26 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752120AbbGREvU (ORCPT + 1 other); Sat, 18 Jul 2015 00:51:20 -0400 Received: from mail-pd0-f182.google.com ([209.85.192.182]:36767 "EHLO mail-pd0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751590AbbGREvS (ORCPT ); Sat, 18 Jul 2015 00:51:18 -0400 Received: by pdjr16 with SMTP id r16so72561287pdj.3 for ; Fri, 17 Jul 2015 21:51:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:from:to:subject:message-id:mime-version:content-type :content-disposition:user-agent; bh=R6sEHGHfHIljmP5vHQ+e3F559Mtn+XZYa/ngKsgWHSE=; b=WY7ERxnes5phjcpPIffuvBvzH+atk9MQYcW0FOoRV+wcUcpNlQk/3gz/Y7o4xtVJ11 oZHMCpwnKBeeamK3pDJoVnpK1PxGkOUghGpOKWe1XzxlvGFvVr0nim0zsuMgaw1VwwF8 EA/JcC6R6aAcOWyViErFI6PCY1mJJBco16N963A9pBe0GSFXnBz9li19ojNGGTtMaQrf 16yo8J1fNjh9M67jQtGIRPex2tuYrRGpkoj+rt7z9FYFHVnNjU1d3oKnDiyQWkI3sNMh b2RvR7VTfOuiDmGi9MKiSFpPUBIwD5HJu4YXo1Ncd47RHFA/bccExPVuSCP9/T3TXcw1 J0zQ== X-Received: by 10.68.198.101 with SMTP id jb5mr36424536pbc.84.1437195078293; Fri, 17 Jul 2015 21:51:18 -0700 (PDT) Received: from shambles.windy (c122-106-152-45.carlnfd1.nsw.optusnet.com.au. [122.106.152.45]) by smtp.gmail.com with ESMTPSA id da3sm13015861pdb.8.2015.07.17.21.51.15 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 17 Jul 2015 21:51:17 -0700 (PDT) Date: Sat, 18 Jul 2015 14:51:03 +1000 From: Vincent McIntyre To: linux-media@vger.kernel.org Subject: [patch] fix failure when applying backports/debug.patch Message-ID: <20150718045023.GA3204@shambles.windy> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 6.0.0.2142326, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2015.7.18.44215 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' FORGED_FROM_GMAIL 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_2000_2999 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, DKIM_SIGNATURE 0, NO_URI_HTTPS 0, SINGLE_URI_IN_BODY 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CD 0, __CP_URI_IN_BODY 0, __CT 0, __CT_TEXT_PLAIN 0, __FRAUD_WEBMAIL 0, __FRAUD_WEBMAIL_FROM 0, __FROM_GMAIL 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILING_LIST 0, __MIME_TEXT_ONLY 0, __MIME_VERSION 0, __PHISH_SPEAR_STRUCTURE_1 0, __SANE_MSGID 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_IN_BODY 0, __URI_NO_WWW 0, __URI_NS , __USER_AGENT 0, __YOUTUBE_RCVD 0' Hi, backports/debug.patch has gotten out of sync with the main tree. The last patch hunk fails: ... Applying patches for kernel 3.13.0-57-generic patch -s -f -N -p1 -i ../backports/api_version.patch patch -s -f -N -p1 -i ../backports/pr_fmt.patch patch -s -f -N -p1 -i ../backports/debug.patch 1 out of 1 hunk FAILED make[2]: *** [apply_patches] Error 1 make[2]: Leaving directory `/home/vjm/git/clones/media_build/linux' make[1]: *** [allyesconfig] Error 2 make[1]: Leaving directory `/home/vjm/git/clones/media_build/v4l' make: *** [allyesconfig] Error 2 can't select all drivers at ./build line 490, line 4. This happens because this change removed the #define DEBUG line commit 890024ad144902bfa637f23b94b396701a88ed88 Author: Ezequiel Garcia Date: Fri Jul 3 16:11:41 2015 -0300 [media] stk1160: Reduce driver verbosity These messages are not really informational, and just makes the driver's output too verbose. This commit changes some messages to a debug level, removes a really useless "driver loaded" message and finally undefines the DEBUG macro. Signed-off-by: Ezequiel Garcia Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab $ git diff e3e30f63389a319ca45161b07eb74e60f1e7ea20 890024ad144902bfa637f23b94b396701a88ed88 drivers/media/usb/stk1160/stk1160.h @@ -58,6 +58,7 @@ @@ -43,6 +43,6 @@ index abdea48..2eed017 100644 * */ +#undef DEBUG - #define DEBUG #ifdef DEBUG #define stk1160_dbg(fmt, args...) \ + printk(KERN_DEBUG "stk1160: " fmt, ## args) --- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/media/usb/stk1160/stk1160.h b/drivers/media/usb/stk1160/stk1160.h index 3922a6c..72cc8e8 100644 --- a/drivers/media/usb/stk1160/stk1160.h +++ b/drivers/media/usb/stk1160/stk1160.h @@ -58,7 +58,6 @@ * new drivers should use. * */ -#define DEBUG #ifdef DEBUG #define stk1160_dbg(fmt, args...) \ printk(KERN_DEBUG "stk1160: " fmt, ## args) The following should fix the issue diff --git a/backports/debug.patch b/backports/debug.patch index a222783..cbd9526 100644 --- a/backports/debug.patch +++ b/backports/debug.patch @@ -35,7 +35,7 @@ index fb2acc5..8edffcb 100644 #endif diff --git a/drivers/media/usb/stk1160/stk1160.h b/drivers/media/usb/stk1160/stk1160.h -index abdea48..2eed017 100644 +index 72cc8e8..323e5d7 100644 --- a/drivers/media/usb/stk1160/stk1160.h +++ b/drivers/media/usb/stk1160/stk1160.h