From patchwork Sun Sep 15 22:05:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 173812 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp2818820ilq; Sun, 15 Sep 2019 15:06:02 -0700 (PDT) X-Google-Smtp-Source: APXvYqwBNubyHbS/2CtCErAC7OBrwSb7FYBoM9bwkSnQThqGPFXFQS2bdc29Is73TqE8LzcpWavk X-Received: by 2002:a17:906:1310:: with SMTP id w16mr888562ejb.73.1568585162608; Sun, 15 Sep 2019 15:06:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568585162; cv=none; d=google.com; s=arc-20160816; b=O5r8B94kMH7BGeusqI7cFiNgUftjJaX7U/P2VxSJ+b9CMXH2nYGkpZTDOp5KCqFu3C oTv74060CIcFeXlsF1AVgtHOIcBRV9PHLt7LhxBtVvs2dd8kUjf4KRol7dFnw5fxMumY FOgkU0tSSPSwjVYmb+txdDcH9g6g+0nMbFQ0ts8bygAvN/YOjRxkQuqE12/4FTPmT3W0 QRSFBwmxZtqWTN8PfTkkjYrhODbDGXWFsaLRKaPSut8spK2cAmByB00WVp0b9NmZ6mBE 1OVIAGHQ21mOhwLQw9RvXVPBtHKH4D6rLO2rURY9prvPuX4rOzPZ5iJXu14mezPLt1OP RkUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:user-agent:content-disposition :mime-version:message-id:subject:cc:to:from:date:dkim-signature; bh=BZfamDuKW9zum2bvuldn42rfct2cwwZfcxINJ6AUDaU=; b=uQlT2PGZgPt70JFO76ayLV5ht8eSfgOSMWdf6XOTd7szUh08z+1qBFYI6XQMc/G8Ba ggd8XDD4D67sfnzm0GYi/I00tOUPoflgnZOxxTlp3hH4zBM0r7fWJFhwK+BNlhXtjhrs w8jFEpo1mHQmDWSH8LEGc20ZzjWTiZId6d96RXKsmLViF76R7M6y6JIBWdVmoFhb17w0 q+Y45I6I3D09EyZGfkGK3STeztMCPFxvs4/K+cVRFXwwIGNIdpt9OvXtKccWSHxJ/meA IBtpP9lWKzxgFxwole0c5Dtx6bsFe2mqFnadVoyBrAwyP3hGWpOlb9Ei8a89y/ixM/Og ye2g== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=uaPxHNRn; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q7si4681254ejo.388.2019.09.15.15.06.02; Sun, 15 Sep 2019 15:06:02 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=fail header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=uaPxHNRn; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727050AbfIOWFy (ORCPT + 27 others); Sun, 15 Sep 2019 18:05:54 -0400 Received: from heliosphere.sirena.org.uk ([172.104.155.198]:60300 "EHLO heliosphere.sirena.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725775AbfIOWFy (ORCPT ); Sun, 15 Sep 2019 18:05:54 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sirena.org.uk; s=20170815-heliosphere; h=Content-Type:MIME-Version: Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=BZfamDuKW9zum2bvuldn42rfct2cwwZfcxINJ6AUDaU=; b=uaPxHNRnfn82HYDMOSTS0t0Ab accoD3vXIPGEmMHOKsXnRS2L/TJO8tZbdlvqpKcmaGoFPbfdbib59bZilPBIaffRnFTXhhC56ABs4 THZT0bc/XeIEtRUmeJCBIuoOMbyiXuf913s+Nt+kW1zvDRkfTKOy45k63LhTQxn0JR/X8=; Received: from cpc102320-sgyl38-2-0-cust46.18-2.cable.virginm.net ([82.37.168.47] helo=ypsilon.sirena.org.uk) by heliosphere.sirena.org.uk with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1i9ceU-0001Th-Ao; Sun, 15 Sep 2019 22:05:50 +0000 Received: by ypsilon.sirena.org.uk (Postfix, from userid 1000) id 5F6DE27415FF; Sun, 15 Sep 2019 23:05:49 +0100 (BST) Date: Sun, 15 Sep 2019 23:05:49 +0100 From: Mark Brown To: Jessica Yu , Masahiro Yamada , Matthias Maennich Cc: Linux Next Mailing List , Linux Kernel Mailing List Subject: linux-next: manual merge of the modules tree with the kbuild tree Message-ID: <20190915220549.GK4352@sirena.co.uk> MIME-Version: 1.0 Content-Disposition: inline X-Cookie: Man and wife make one fool. User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi all, Today's linux-next merge of the modules tree got a conflict in: scripts/Makefile.modpost between commit: 9b9a3f20cbe0ba ("kbuild: split final module linking out into Makefile.modfinal") from the kbuild tree and commit: eb8305aecb958e ("cripts: Coccinelle script for namespace dependencies.") from the modules tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. diff --cc scripts/Makefile.modpost index 9800a3988f23e,743fe3a2e885f..0000000000000 --- a/scripts/Makefile.modpost +++ b/scripts/Makefile.modpost diff --git a/scripts/Makefile.modfinal b/scripts/Makefile.modfinal index 411c1e600e7dd..c164d644138ab 100644 --- a/scripts/Makefile.modfinal +++ b/scripts/Makefile.modfinal @@ -42,6 +42,8 @@ $(modules): %.ko: %.o %.mod.o $(KBUILD_LDS_MODULE) FORCE targets += $(modules) $(modules:.ko=.mod.o) +nsdeps: __modpost + # Add FORCE to the prequisites of a target to force it to be always rebuilt. # ---------------------------------------------------------------------------