From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757388AbdLQPC1 (ORCPT ); Sun, 17 Dec 2017 10:02:27 -0500 Received: from mail-wm0-f43.google.com ([74.125.82.43]:46420 "EHLO mail-wm0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757372AbdLQPCZ (ORCPT ); Sun, 17 Dec 2017 10:02:25 -0500 X-Google-Smtp-Source: ACJfBovG101YCtcSG4XVgscU9RZQjf3eU9OuYWCp4QL9+qboysg+stLQLU27ka0eEmUinHiZsUjoaQ== Date: Sun, 17 Dec 2017 16:02:21 +0100 From: Ingo Molnar To: Linus Torvalds Cc: Linux Kernel Mailing List , Thomas Gleixner , Peter Zijlstra , Borislav Petkov , "H. Peter Anvin" , Andy Lutomirski , Andrew Morton Subject: Re: [RFC GIT PULL] x86 Page Table Isolation (PTI) syscall entry code preparatory patches Message-ID: <20171217150220.nmgyvkbrkgvsu3zp@gmail.com> References: <20171216015859.ce6axpnkoyevdtpw@gmail.com> <20171216234631.zajbgjnzs642iskg@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20171216234631.zajbgjnzs642iskg@gmail.com> User-Agent: NeoMutt/20170609 (1.8.3) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org * Ingo Molnar wrote: > > was supposed to be a synchronization point, but if you do > > > > git diff 9a818d1a3235..9a818d1a3235^ > > > > it isn't actually synchronized. It's *almost* synchronized, but not > > quite. How did those cherry-picks that were already upstream end up > > causing *changes* upstream? That's odd. > > > > So there are some technical oddities in there. > > Indeed, and I tried to make it a no-op merge, and it's _almost_ a no-op merge, > except these two commits: > > One of the PTI namespace preparatory patches ended up in the 'base' tree: > > d78b637b29a2: drivers/misc/intel/pti: Rename the header file to free up the namespace > > plus there's this cherry-pick from a very recent upstream kernel: > > c3bc8b53d54c: bpf: fix build issues on um due to mising bpf_perf_event.h > > which was required for UML to build and be testable. > > We can move both commits to a later stage in the tree to make the v4.14 base tree > an 'obvious' upstream-identical tree. > > Will respin it all tomorrow. So today I've respun it all, and I think it all got cleaner. I'm going to send you 3 pull requests: 1) a 'preparatory tree' that is a single commit that frees up the PTI namespace 2) the 'v4.14 backport base tree' which is fully synchronized an should be a no-op merge on your side. I also organized it a bit better with all cherry-picks in a single linear range of commits, with clear notations. 3) the 'per CPU syscall tree', which will be a clean, linear series of commits with no merge distractions whatsoever. The first two you could pull today, with very low risk levels. Thanks, Ingo