From patchwork Fri Dec 8 23:29:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Jasmin J." X-Patchwork-Id: 45876 Received: from vger.kernel.org ([209.132.180.67]) by www.linuxtv.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eNS5d-00086i-VB; Fri, 08 Dec 2017 23:29:58 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753237AbdLHX3z (ORCPT + 1 other); Fri, 8 Dec 2017 18:29:55 -0500 Received: from mail.anw.at ([195.234.101.228]:56869 "EHLO mail.anw.at" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752662AbdLHX3y (ORCPT ); Fri, 8 Dec 2017 18:29:54 -0500 Received: from [192.168.23.40] (anwhome.anw.at [195.234.103.23]) by mail.anw.at (8.14.4/8.14.4/Debian-4.1ubuntu1) with ESMTP id vB8NTphu015257; Sat, 9 Dec 2017 00:29:51 +0100 Subject: Re: [PATCH] build: Added missing timer_setup_on_stack To: Vincent McIntyre , Hans Verkuil Cc: linux-media@vger.kernel.org, d.scheller@gmx.net References: <1512766859-7667-1-git-send-email-jasmin@anw.at> <3343c1fd-d0f0-46b1-fd3f-150f36de6fa4@anw.at> <21ccbddb-eada-fa44-93ea-f0b80e17d409@xs4all.nl> <20171208231606.GA5540@shambles.windy> From: "Jasmin J." Message-ID: Date: Sat, 9 Dec 2017 00:29:48 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 In-Reply-To: <20171208231606.GA5540@shambles.windy> Content-Language: en-GB X-Antivirus: checked in 0.014sec at mail.anw.at ([195.234.102.72]) by smf-clamd v1.2.1 - http://smfs.sf.net/ Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Hello Vincent! > Not quite there yet however. I always test with several Kernel headers ... > patch -s -f -N -p1 -i ../backports/api_version.patch > patch -s -f -N -p1 -i ../backports/pr_fmt.patch > 1 out of 1 hunk FAILED I have tested the patches on Linux Mint 18.1 (Kernel 4.4.0-62-generic): Applying patches for kernel 4.4.0-62-generic patch -f -N -p1 -i ../backports/api_version.patch checking file drivers/media/cec/cec-api.c Hunk #1 succeeded at 95 (offset 2 lines). checking file drivers/media/v4l2-core/v4l2-ioctl.c Hunk #1 succeeded at 1004 (offset 4 lines). checking file drivers/media/media-device.c patching file drivers/media/cec/cec-api.c Hunk #1 succeeded at 95 (offset 2 lines). patching file drivers/media/v4l2-core/v4l2-ioctl.c Hunk #1 succeeded at 1004 (offset 4 lines). patching file drivers/media/media-device.c patch -f -N -p1 -i ../backports/pr_fmt.patch checking file drivers/media/common/saa7146/saa7146_core.c checking file drivers/media/common/saa7146/saa7146_fops.c checking file drivers/media/common/saa7146/saa7146_hlp.c checking file drivers/media/common/saa7146/saa7146_i2c.c checking file drivers/media/common/saa7146/saa7146_video.c checking file drivers/media/common/siano/smscoreapi.h Apply this patch, so we can see on which file it stops: BR, Jasmin diff --git a/linux/Makefile b/linux/Makefile index ce39f82..5fc5150 100644 --- a/linux/Makefile +++ b/linux/Makefile @@ -147,9 +147,9 @@ apply_patches apply-patches: touch .patches_applied; \ rm -f mm/frame_vector.c; \ for i in $$PATCHES; do \ - echo patch -s -f -N -p1 -i ../backports/$$i; \ - patch -s -f -N -p1 -i ../backports/$$i --dry-run || exit 1; \ - patch -s -f -N -p1 -i ../backports/$$i; \ + echo patch -f -N -p1 -i ../backports/$$i; \ + patch -f -N -p1 -i ../backports/$$i --dry-run || exit 1; \ + patch -f -N -p1 -i ../backports/$$i; \ mv .patches_applied .patches_applied.old; \ echo $$i > .patches_applied; \ cat .patches_applied.old >> .patches_applied; \ @@ -165,8 +165,8 @@ unapply_patches unapply-patches: @if [ -e .patches_applied ]; then \ echo "Unapplying patches"; \ for i in `cat .patches_applied|grep -v '^#'`; do \ - echo patch -s -f -R -p1 -i ../backports/$$i; \ - patch -s -f -R -p1 -i ../backports/$$i || break; \ + echo patch -f -R -p1 -i ../backports/$$i; \ + patch -f -R -p1 -i ../backports/$$i || break; \ done; \ rm -f mm/frame_vector.c; \ rm -f .patches_applied; fi