Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp2140812pxb; Mon, 18 Jan 2021 09:13:01 -0800 (PST) X-Google-Smtp-Source: ABdhPJzqhsnYflqsSabtNcwo6ZTE1cnPOWovWy38Qsvu7r49dfmG64oeEd86JQ8iFaunFhg7XhR6 X-Received: by 2002:a05:6402:438d:: with SMTP id o13mr345444edc.135.1610989981210; Mon, 18 Jan 2021 09:13:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1610989981; cv=none; d=google.com; s=arc-20160816; b=FDi2Rl13pptlwmzKmzlWUAyNhZ5jIQb74htcKxXiGxcVANiRKfrO4eTLeaiiT7mFca lpwGlO7SHdrjnPHpM+AGGUX2m8iqTJvZB42qS+YJ5Fr6+oQMXupDs5BtI4T4aJx4R2H2 lyaNVNsA1OqZ2DFYxXDzipG6gg4rGt11rYIbkO7NEr9U4MLvzrSebs+NM2BluY8JKz6j 7eJm6jXOm0oc0Q+SGo6PmgYzmhu9RKaAIx5G1OSLohW5lDe65FDU+txNyd0wP9rxLTx5 NUmWYwAVsjCZmchUQjwL9YxBWrUUkYdX4aItR50+ovAr5WLPaluUQLgOABjdFNjBYEuz /V0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:content-language :in-reply-to:mime-version:user-agent:date:message-id:from:references :cc:to:subject; bh=7RnDBRUmXqvbnq/HYR/0PHXocUrAuNJbsze/8frx2Eg=; b=wLyosK0oQ7xz5AkWVJRhWwxNCycIETE1otfjjAXamcI0xfdaRU/bm8D9Dnnd9s2ohj kFODVAQ2GjH2C3g+yGym3fCKiflfMaAVNqcHFx5UryQdRp/Z5inzhjKbnjZMvoFIDc8v 1ro4e4CiHFxXHVgxFxO12EezmbrEukwdNUOt4JsBpUQGgelUvMpjLmlK7mIPEPBcxq8x mWUYurNvUVIBc6Xb5i0T2f8i6Df71aY+TcfnM//7pznCJwDQ06HBmD+15IjCQta990Uk P3vG48PyLSoUczYsHCvHXYu7aymMBaZUwrQefehJjfdgj1UMLkVsbA/GfSvllLrKz4rU 9z1A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id q16si7569567edc.229.2021.01.18.09.12.37; Mon, 18 Jan 2021 09:13:01 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2406954AbhARRKx (ORCPT + 99 others); Mon, 18 Jan 2021 12:10:53 -0500 Received: from outpost1.zedat.fu-berlin.de ([130.133.4.66]:34185 "EHLO outpost1.zedat.fu-berlin.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2405850AbhARRKQ (ORCPT ); Mon, 18 Jan 2021 12:10:16 -0500 Received: from inpost2.zedat.fu-berlin.de ([130.133.4.69]) by outpost.zedat.fu-berlin.de (Exim 4.94) with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (envelope-from ) id 1l1Y20-0011Om-6P; Mon, 18 Jan 2021 18:09:31 +0100 Received: from p5b13a61e.dip0.t-ipconnect.de ([91.19.166.30] helo=[192.168.178.139]) by inpost2.zedat.fu-berlin.de (Exim 4.94) with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (envelope-from ) id 1l1Y1z-001IsJ-Hg; Mon, 18 Jan 2021 18:09:31 +0100 Subject: Re: [PATCH 2/2] sh: boot: avoid unneeded rebuilds under arch/sh/boot/compressed/ To: Masahiro Yamada Cc: Yoshinori Sato , Rich Felker , Linux-sh list , Arnd Bergmann , Brendan Higgins , Greg Kroah-Hartman , Russell King , "Steven Rostedt (VMware)" , Linux Kernel Mailing List References: <20210117111632.2392635-1-masahiroy@kernel.org> <20210117111632.2392635-2-masahiroy@kernel.org> From: John Paul Adrian Glaubitz Message-ID: <2d51d847-816a-d645-2296-79728656a196@physik.fu-berlin.de> Date: Mon, 18 Jan 2021 18:09:30 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.6.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Original-Sender: glaubitz@physik.fu-berlin.de X-Originating-IP: 91.19.166.30 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Masahiro! On 1/17/21 5:21 PM, Masahiro Yamada wrote: >> This patch doesn't apply for me while the first one applies without problems: >> >> glaubitz@epyc:..glaubitz/linux-git> git am ../sh-patches-2021/\[PATCH\ 1_2\]\ sh\:\ boot\:\ add\ intermediate\ vmlinux.bin\*\ to\ targets\ instead\ of\ extra-y.eml >> Applying: sh: boot: add intermediate vmlinux.bin* to targets instead of extra-y >> glaubitz@epyc:..glaubitz/linux-git> git am ../sh-patches-2021/\[PATCH\ 2_2\]\ sh\:\ boot\:\ avoid\ unneeded\ rebuilds\ under\ arch_sh_boot_compressed_.eml >> Applying: sh: boot: avoid unneeded rebuilds under arch/sh/boot/compressed/ >> error: arch/sh/boot/compressed/ashiftrt.S: already exists in working directory >> error: arch/sh/boot/compressed/ashldi3.c: already exists in working directory >> error: arch/sh/boot/compressed/ashlsi3.S: already exists in working directory >> error: arch/sh/boot/compressed/ashrsi3.S: already exists in working directory >> error: arch/sh/boot/compressed/lshrsi3.S: already exists in working directory > > Adrian, these 5 files are currently generated files. > > That is why git-am failed. I already guessed that. I removed them now and the patch applies cleanly. Will test-boot on my SH-7785LCR in a minute. > They are not cleaned up by 'make ARCH=sh clean' > (this is a bug too). That should be easy to fix I guess :-). Adrian -- .''`. John Paul Adrian Glaubitz : :' : Debian Developer - glaubitz@debian.org `. `' Freie Universitaet Berlin - glaubitz@physik.fu-berlin.de `- GPG: 62FF 8A75 84E0 2956 9546 0006 7426 3B37 F5B5 F913