From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id AEB74C38142 for ; Tue, 31 Jan 2023 12:45:07 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 43F5B10E330; Tue, 31 Jan 2023 12:45:01 +0000 (UTC) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTPS id 40EDB10E32D; Tue, 31 Jan 2023 12:44:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1675169099; x=1706705099; h=date:from:to:cc:subject:message-id:references: mime-version:in-reply-to; bh=/RwQqzhoI4pLDu/LgYP8NfjxFwOXtYObH6J5azZ9fcE=; b=WCWqomjSPzzN647NwnwJN8aMyAwE37oEnyLnortjwErUFIQ3hEUIj3c2 EoRK4Y48qpKRVdtnfhriTC9s74Uhf0aJ+HVJU8mMXeBlVsfI1nev0IixR 45ULTPUvjNus7wdxQzagdReQ/4qBmTTZcc+7ysqS4hv2CXiqvKplDAWJm N/lU+Ai36dOc+XvBO/aYE04Aw9XgiQXI3qwAmbCIBMDYd4FgMA3BHYlAt 12G7jQyTh3PziusBCSly9y/kCVIz2Ts6GT1+MHcXxw060k52JuJdlE+k0 aBq/wqbDLCEGJm9CWSpYCDzQIaPHDi536PpJf+7wDxapE33h66LzUkA/U w==; X-IronPort-AV: E=McAfee;i="6500,9779,10606"; a="325525923" X-IronPort-AV: E=Sophos;i="5.97,261,1669104000"; d="scan'208";a="325525923" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 Jan 2023 04:44:58 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10606"; a="733097607" X-IronPort-AV: E=Sophos;i="5.97,261,1669104000"; d="scan'208";a="733097607" Received: from smile.fi.intel.com ([10.237.72.54]) by fmsmga004.fm.intel.com with ESMTP; 31 Jan 2023 04:44:55 -0800 Received: from andy by smile.fi.intel.com with local (Exim 4.96) (envelope-from ) id 1pMq0L-000Fg8-1n; Tue, 31 Jan 2023 14:44:53 +0200 Date: Tue, 31 Jan 2023 14:44:53 +0200 From: Andy Shevchenko To: Stephen Rothwell Message-ID: References: <20230131130305.019029ff@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230131130305.019029ff@canb.auug.org.au> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo Subject: Re: [Intel-gfx] linux-next: manual merge of the usb tree with the drm-intel-fixes tree X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Greg Kroah-Hartman , Greg KH , Intel Graphics , Linux Kernel Mailing List , Daniel Vetter , Linux Next Mailing List , DRI , Rodrigo Vivi Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Tue, Jan 31, 2023 at 01:03:05PM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the usb tree got a conflict in: > > drivers/gpu/drm/i915/gt/intel_engine_cs.c > > between commit: > > 5bc4b43d5c6c ("drm/i915: Fix up locking around dumping requests lists") > > from the drm-intel-fixes tree and commit: > > 4d70c74659d9 ("i915: Move list_count() to list.h as list_count_nodes() for broader use") > > from the usb tree. > > I fixed it up (the former removed the code changed by the latter) Hmm... Currently I see that 20230127002842.3169194-4-John.C.Harrison@Intel.com moves the code to the drivers/gpu/drm/i915/gt/intel_execlists_submission.c. Is there any new series beside the above mentioned that touches that file and actually _removes_ that code? > 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. -- With Best Regards, Andy Shevchenko