Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp3874186pxj;
        Tue, 15 Jun 2021 10:27:09 -0700 (PDT)
X-Google-Smtp-Source: ABdhPJyxHSzX+bcpCRkyQeQvEb6YWBfPLSBIhGhlrHEUxKgnKC4MhSNGFMWbgDdEhfYfiAUFFI9q
X-Received: by 2002:aa7:d309:: with SMTP id p9mr483751edq.340.1623778029669;
        Tue, 15 Jun 2021 10:27:09 -0700 (PDT)
ARC-Seal: i=1; a=rsa-sha256; t=1623778029; cv=none;
        d=google.com; s=arc-20160816;
        b=vvQ/N8/5QRgQJqALEtFK0Gj9HZGIGEjMw96TNUCMtk39Emllu2P20a7+/lStYvgIOA
         8PN3Xykhd79WTK9aI9jXRQyJ75ob1joOXBSThUZmEIAFX1thaMQVz//lmOQmSIxsyLKs
         plYWaYQuP2O+zDBziDnezvb5Dd+XQhk+w4z2U4b6cSsvfYrAu6CVg1RY7Aoclmz1tURt
         31ozQ6NShN9cd1sEBDy9wa2iwGRkMH7jObzvcFMhZDFuxQUwRsrw8h09CJRL04T2WEb5
         Ti/flWMy74QxhDk0uf0Uy/P3f5PX5LeDZ+2oogVGevam4eLPQ2Reg2x9/ZEjR3DJdAZy
         80ug==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816;
        h=list-id:precedence:in-reply-to:content-disposition:mime-version
         :references:message-id:subject:cc:to:from:date:dkim-signature;
        bh=fROwX1Fe7yi2T3mwV8B7UzVtscUMWSlmHdaRIUoVzQc=;
        b=0k1FFSzTAeItTTaqCJOgBu5wEDyogTr9x0zxVlHuMTskJ/GXR/r3IVQ8b7HWb1p5yA
         6QOqp1x1TA3diPanWdUVMseR0TBftiD0LZAff9kYmJ0JUU7nCayX6nOXIXoEFTZW2oTc
         Z/a5Bqql57GyGrgfh969yPhI4rIqbUwW0MBH8UYpp0wdkd5SL2SLDeJk07Nyv4eg6Qts
         0+IbZ2Jz1co3+50INdGNNYFbSIMqg84K/91Sc4gIFpz2O8ezvlLoCHl3KQ0nnKuuNpA/
         5w/+RY5NuDi3EOtahZJPU+oBGHbOhaK8PdxoP7FZwCszNUB9RMJHMi0LVaLgrlaUG9IG
         c/Ow==
ARC-Authentication-Results: i=1; mx.google.com;
       dkim=pass header.i=@alien8.de header.s=dkim header.b=J0X6NhRj;
       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;
       dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=alien8.de
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18])
        by mx.google.com with ESMTP id dk7si2304978ejb.747.2021.06.15.10.26.45;
        Tue, 15 Jun 2021 10:27:09 -0700 (PDT)
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;
       dkim=pass header.i=@alien8.de header.s=dkim header.b=J0X6NhRj;
       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;
       dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=alien8.de
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S229879AbhFOR1j (ORCPT <rfc822;lwx169@gmail.com> + 99 others);
        Tue, 15 Jun 2021 13:27:39 -0400
Received: from mail.skyhub.de ([5.9.137.197]:58096 "EHLO mail.skyhub.de"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S229492AbhFOR1i (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
        Tue, 15 Jun 2021 13:27:38 -0400
Received: from zn.tnic (p200300ec2f0f270048ecafc2d258032c.dip0.t-ipconnect.de [IPv6:2003:ec:2f0f:2700:48ec:afc2:d258:32c])
        (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
        (No client certificate requested)
        by mail.skyhub.de (SuperMail on ZX Spectrum 128k) with ESMTPSA id A4B691EC030E;
        Tue, 15 Jun 2021 19:25:31 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alien8.de; s=dkim;
        t=1623777931;
        h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
         to:to:cc:cc:mime-version:mime-version:content-type:content-type:
         content-transfer-encoding:in-reply-to:in-reply-to:  references:references;
        bh=fROwX1Fe7yi2T3mwV8B7UzVtscUMWSlmHdaRIUoVzQc=;
        b=J0X6NhRjmNmNRvBShcsPVRh60eCtohIoXCFUk1Xq3zbWAuRFlYDFY/2u36ap2rbfkc99Cr
        QcHazIUor3FdlYmQSsSS3FgQKqwpg9h+jaEz69xJM/s4UtFxq8moD9YOTEpo76hdM1qNzl
        L/dYEmt13l/l+WbEacivx+ts9l3AHZs=
Date:   Tue, 15 Jun 2021 19:25:20 +0200
From:   Borislav Petkov <bp@alien8.de>
To:     James Morse <james.morse@arm.com>
Cc:     Reinette Chatre <reinette.chatre@intel.com>, x86@kernel.org,
        linux-kernel@vger.kernel.org, Fenghua Yu <fenghua.yu@intel.com>,
        Thomas Gleixner <tglx@linutronix.de>,
        Ingo Molnar <mingo@redhat.com>, H Peter Anvin <hpa@zytor.com>,
        Babu Moger <Babu.Moger@amd.com>,
        shameerali.kolothum.thodi@huawei.com,
        Jamie Iles <jamie@nuviainc.com>,
        D Scott Phillips OS <scott@os.amperecomputing.com>,
        lcherian@marvell.com, "Luck, Tony" <tony.luck@intel.com>
Subject: Re: [PATCH v4 00/24] x86/resctrl: Merge the CDP resources
Message-ID: <YMjigIy7iincvT67@zn.tnic>
References: <20210614200941.12383-1-james.morse@arm.com>
 <cc452592-491f-3ddf-983a-8669ad12df9a@intel.com>
 <4d2ba7c1-395b-d1ec-c92b-f906e2a551a1@arm.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
In-Reply-To: <4d2ba7c1-395b-d1ec-c92b-f906e2a551a1@arm.com>
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Tue, Jun 15, 2021 at 05:48:25PM +0100, James Morse wrote:
> Please point me at something to rebase onto!
> (as far as I can see, tip/x86/cache hasn't moved)

Just use tip/master when that branch hasn't moved. We usually
fast-forward those branches to the latest Linus -rc before applying new
stuff.

And I'm sure we should be able to handle kernel-doc conflicts when
applying.

:-)

Thx.

-- 
Regards/Gruss,
    Boris.

https://people.kernel.org/tglx/notes-about-netiquette