From: Ingo Molnar <mingo@kernel.org>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Thomas Gleixner <tglx@linutronix.de>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Balbir Singh <sblbir@amazon.com>,
Peter Zijlstra <a.p.zijlstra@chello.nl>,
Andrew Morton <akpm@linux-foundation.org>,
Borislav Petkov <bp@alien8.de>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Andrew Lutomirski <luto@kernel.org>
Subject: [GIT PULL v3] x86/mm changes for v5.8
Date: Fri, 5 Jun 2020 10:11:37 +0200 [thread overview]
Message-ID: <20200605081137.GA2231266@gmail.com> (raw)
In-Reply-To: <CAHk-=whK846PwG_qNqyb-q-BSPALb=xZ9k6ThVjRm8u=vCpkqA@mail.gmail.com>
* Linus Torvalds <torvalds@linux-foundation.org> wrote:
> On Thu, Jun 4, 2020 at 10:29 AM Ingo Molnar <mingo@kernel.org> wrote:
> >
> > Yeah, sure - here's the updated pull request for the rest:
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-mm-2020-06-04
> >
> > # HEAD: bd1de2a7aace4d1d312fb1be264b8fafdb706208 x86/tlb/uv: Add a forward declaration for struct flush_tlb_info
>
> Nope, that still points to
>
> 0fcfdf55db9e1ecf85edd6aa8d0bc78a448cb96a Documentation: Add L1D
> flushing Documentation
>
> although it looks like the 'x86/mm' _branch_ does point to that commit
> bd1de2a7aace.
>
> You did something odd where you created a new tag, but used the old branch. Hmm?
Oops, my apologies, indeed I did something odd with tags: my testing
script used a x86-mm-for-linus temporary branch to construct the tag
and test the tree, and merged x86/mm into it - but this branch was
still a leftover from the previous pull request and the merge of
x86/mm into it succeeded without an error ...
In a comedy of errors, while it used the out of date x86-mm-for-linus
to generate the tag, it consistently used the correct x86/mm branch
for the pull request itself, and thus my fail-safes to catch such
mishaps of sending the wrong tree to you all failed. :-/
I fixed my tag workflow, re-tested this case (and a few others) to
make sure it doesn't happen again, and find below the updated v3 pull
request. Sorry about this!
---
Linus,
Please pull the latest x86/mm git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-mm-2020-06-05
# HEAD: bd1de2a7aace4d1d312fb1be264b8fafdb706208 x86/tlb/uv: Add a forward declaration for struct flush_tlb_info
Misc changes:
- Unexport various PAT primitives
- Unexport per-CPU tlbstate
Thanks,
Ingo
------------------>
Borislav Petkov (1):
x86/tlb/uv: Add a forward declaration for struct flush_tlb_info
Christoph Hellwig (5):
x86/mm: Add a x86_has_pat_wp() helper
x86/mm: Move pgprot2cachemode out of line
x86/mm: Cleanup pgprot_4k_2_large() and pgprot_large_2_4k()
x86/mm: Unexport __cachemode2pte_tbl
x86/mm: Use pgprotval_t in protval_4k_2_large() and protval_large_2_4k()
Thomas Gleixner (17):
x86/tlb: Uninline __get_current_cr3_fast()
x86/cpu: Uninline CR4 accessors
x86/cr4: Sanitize CR4.PCE update
x86/alternatives: Move temporary_mm helpers into C
x86/tlb: Move __flush_tlb() out of line
x86/tlb: Move __flush_tlb_global() out of line
x86/tlb: Move __flush_tlb_one_user() out of line
x86/tlb: Move __flush_tlb_one_kernel() out of line
x86/tlb: Move flush_tlb_others() out of line
x86/tlb: Move __flush_tlb_all() out of line
x86/tlb: Move paravirt_tlb_remove_table() to the usage site
x86/tlb: Move cr4_set_bits_and_update_boot() to the usage site
x86/tlb: Uninline nmi_uaccess_okay()
x86/tlb: Move PCID helpers where they are used
xen/privcmd: Remove unneeded asm/tlb.h include
x86/tlb: Restrict access to tlbstate
x86/cpu: Export native_write_cr4() only when CONFIG_LKTDM=m
arch/x86/events/core.c | 11 +-
arch/x86/include/asm/memtype.h | 3 +
arch/x86/include/asm/mmu_context.h | 88 +------
arch/x86/include/asm/paravirt.h | 12 +-
arch/x86/include/asm/pgtable_32.h | 2 +-
arch/x86/include/asm/pgtable_types.h | 44 +---
arch/x86/include/asm/tlbflush.h | 441 ++++-------------------------------
arch/x86/include/asm/uv/uv.h | 1 +
arch/x86/kernel/alternative.c | 55 +++++
arch/x86/kernel/cpu/common.c | 25 +-
arch/x86/kernel/cpu/mtrr/generic.c | 4 +-
arch/x86/kernel/paravirt.c | 21 +-
arch/x86/kernel/process.c | 11 +
arch/x86/mm/init.c | 44 +++-
arch/x86/mm/init_64.c | 4 +-
arch/x86/mm/ioremap.c | 10 +-
arch/x86/mm/kmmio.c | 2 +-
arch/x86/mm/mem_encrypt.c | 2 +-
arch/x86/mm/pat/set_memory.c | 7 +-
arch/x86/mm/pgtable.c | 16 +-
arch/x86/mm/pgtable_32.c | 2 +-
arch/x86/mm/tlb.c | 384 +++++++++++++++++++++++++++++-
arch/x86/platform/uv/tlb_uv.c | 4 +-
drivers/xen/privcmd.c | 1 -
24 files changed, 608 insertions(+), 586 deletions(-)
next prev parent reply other threads:[~2020-06-05 8:11 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-01 17:01 [GIT PULL] x86/mm changes for v5.8 Ingo Molnar
2020-06-01 21:42 ` Linus Torvalds
2020-06-02 2:35 ` Linus Torvalds
2020-06-02 10:25 ` Singh, Balbir
2020-06-02 7:33 ` Ingo Molnar
2020-06-02 9:37 ` Benjamin Herrenschmidt
2020-06-02 18:28 ` Thomas Gleixner
2020-06-02 19:14 ` Linus Torvalds
2020-06-02 23:01 ` Singh, Balbir
2020-06-02 23:28 ` Linus Torvalds
2020-06-03 1:31 ` Singh, Balbir
2020-06-04 17:29 ` [GIT PULL v2] " Ingo Molnar
2020-06-05 2:41 ` Linus Torvalds
2020-06-05 8:11 ` Ingo Molnar [this message]
2020-06-05 20:40 ` [GIT PULL v3] " pr-tracker-bot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200605081137.GA2231266@gmail.com \
--to=mingo@kernel.org \
--cc=a.p.zijlstra@chello.nl \
--cc=akpm@linux-foundation.org \
--cc=benh@kernel.crashing.org \
--cc=bp@alien8.de \
--cc=linux-kernel@vger.kernel.org \
--cc=luto@kernel.org \
--cc=sblbir@amazon.com \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.