Received: by 2002:a5b:505:0:0:0:0:0 with SMTP id o5csp2393159ybp; Thu, 10 Oct 2019 06:49:42 -0700 (PDT) X-Google-Smtp-Source: APXvYqzLmOM693py9y7nF+qIAfdXIYW4pJfsynJZ9yKDuCiEjwNI5hHHKDQftUyIa7aeCD4uoY9m X-Received: by 2002:a17:906:154a:: with SMTP id c10mr7957215ejd.238.1570715382637; Thu, 10 Oct 2019 06:49:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1570715382; cv=none; d=google.com; s=arc-20160816; b=AsnzSNy2eB4oCF3FA5XuETEkX4f7DJKBWzVD38Pc7OplEjnagVymsthEssBBmA6sjo viUZFRPfTCo7EDkAkEB71EYj5habCoGSdZrIIyyNLQ5Vlci83lNem6hZ/gb4Ld7WVsrJ 6v9OsTGU7MiUQBIMon/XZeafvfHHr7ZT27YJ0o5Qa2FKnDoRMCOqx7k4TLnXpRmAdJan w2Eq1TRDDSzLwxvg4hLnKC0EFaC41KFLthDrW+XoV/FzOCqANlVsXq3DTgCDGIgZpTx1 dZ6dX3AoddpXcJ/+ZS3gdr8P4HOhlUe7DHGSfqB5kPcGko/rH1yobkZE+dw97yLs4pMf f5kg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:user-agent:in-reply-to :content-disposition:mime-version:references:mail-followup-to :message-id:subject:cc:to:from:date:dkim-signature; bh=hoJ6TorxaA0ueOkAnVcY7UKvB59REF8/krI4QbdE3rY=; b=QsX97aG6qHA1zovJKpP/7/rK7OT94hCYnEupWlrZRPnmn1WPAfWCsRb5Of0Nuxhokc i1X4f6kbx2RGNI+V8NPAfuc1xwTln9LeJ9B1cggWBnoBI98UUsfnvJTTmVukwgozuPSB tEOyeP1nREBn0itvWkHZpI/bUsD0vXrQcwfejj5cDw1uJ2cjQT2eoOS4OkwqnPKDANqM PouUbAllpPMRJriZwnF3OCg3l3QKEENTJjyhl3drJRWHw9ZFuGgtNN8IVU23Yvojsyk4 Nds2F4AMsS53j25OU2+Wu+eqwLlLD9BGYPUG2wcCH4WEotVsb9DYR9x0BQZ2/gD0MOsb tq/g== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@ffwll.ch header.s=google header.b=AfuUb30B; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g3si3092896edu.432.2019.10.10.06.49.17; Thu, 10 Oct 2019 06:49:42 -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=@ffwll.ch header.s=google header.b=AfuUb30B; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388147AbfJJNow (ORCPT + 99 others); Thu, 10 Oct 2019 09:44:52 -0400 Received: from mail-ed1-f50.google.com ([209.85.208.50]:42613 "EHLO mail-ed1-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387651AbfJJNoi (ORCPT ); Thu, 10 Oct 2019 09:44:38 -0400 Received: by mail-ed1-f50.google.com with SMTP id y91so5499769ede.9 for ; Thu, 10 Oct 2019 06:44:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=sender:date:from:to:cc:subject:message-id:mail-followup-to :references:mime-version:content-disposition:in-reply-to:user-agent; bh=hoJ6TorxaA0ueOkAnVcY7UKvB59REF8/krI4QbdE3rY=; b=AfuUb30BN2fwLHvc++JsHy0F39WOPWyY6n5BemTQw4OffXIs9XPV8OEKc91w7W4+g5 hrlPzv1yXu60ZCX+CWlLe8CNYfo2zJTFzNtQS/MD5/GwzPcnvFN3neUhaveUI3Q8qoVC VH1RNyOOxQ0acee6EjhlHOvgQbsStXwga5L2c= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:from:to:cc:subject:message-id :mail-followup-to:references:mime-version:content-disposition :in-reply-to:user-agent; bh=hoJ6TorxaA0ueOkAnVcY7UKvB59REF8/krI4QbdE3rY=; b=OfCan/o3S26vRpDCeZWYvaOlOgs/pXi9KUryyHUSDw96XMkx8laB3gkBnGutQGiKzL HiaYBTyUjMHJIO7OYxrTRCUvm+Hl5toaGSGWbv1VIY0QjmeLUMyFDl7m8ZvSCBm/S01S rrYqVPOkbgFfTylcjPoQ3eHH1m4vd94eMzgLYApcm0S2adqrSD1pplsapBNu/ezZNyWg RFojUeih0OwXo2CEmq9obup7aIIogeV0ipzevweXPSHcAXvYAJoNHJepKxqGZj9XoUMf /8M+w7mlERL+h07YDDTzv4Ibtz0wgeeHQUWUkTmOOYuyXSPxQ6GljTXpmkunPG5zVH2v Kfdg== X-Gm-Message-State: APjAAAV7DxdLyuZ1hthMCTYczVJ7W+PPfzMyDnH0nYJfYgD4ajPhBErl TDKzW8cjLV/VRJUfQBXgD64StQ== X-Received: by 2002:a17:906:a986:: with SMTP id jr6mr7585993ejb.158.1570715076498; Thu, 10 Oct 2019 06:44:36 -0700 (PDT) Received: from phenom.ffwll.local (212-51-149-96.fiber7.init7.net. [212.51.149.96]) by smtp.gmail.com with ESMTPSA id r18sm974451edx.94.2019.10.10.06.44.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Oct 2019 06:44:35 -0700 (PDT) Date: Thu, 10 Oct 2019 15:44:33 +0200 From: Daniel Vetter To: Stephen Rothwell Cc: Ingo Molnar , Peter Zijlstra , Linux Kernel Mailing List , DRI , Dave Airlie , Linux Next Mailing List , Qian Cai , "H. Peter Anvin" , Thomas Gleixner , Ingo Molnar Subject: Re: linux-next: build failure after merge of the tip tree Message-ID: <20191010134433.GY16989@phenom.ffwll.local> Mail-Followup-To: Stephen Rothwell , Ingo Molnar , Peter Zijlstra , Linux Kernel Mailing List , DRI , Dave Airlie , Linux Next Mailing List , Qian Cai , "H. Peter Anvin" , Thomas Gleixner , Ingo Molnar References: <20191010131448.482da2b2@canb.auug.org.au> <20191010080207.GA22099@gmail.com> <20191010222210.1365d50b@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20191010222210.1365d50b@canb.auug.org.au> X-Operating-System: Linux phenom 5.2.0-2-amd64 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 On Thu, Oct 10, 2019 at 10:23:21PM +1100, Stephen Rothwell wrote: > Hi Ingo, > > On Thu, 10 Oct 2019 10:02:07 +0200 Ingo Molnar wrote: > > > > I suspect -next will have to carry this semantic merge conflict > > resolution until the DRM tree is merged upstream. > > Yep, its not a real problem, I get a few like this every cycle. Yeah totally within expectations when I acked that cleanup patch. We'll probably have a few more lockdep annotation patches/changes that will conflict in drm. -Daniel -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch