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 X-Spam-Level: X-Spam-Status: No, score=-6.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D36ECC04AB4 for ; Wed, 15 May 2019 02:28:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id ACDE32166E for ; Wed, 15 May 2019 02:28:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726427AbfEOC2b (ORCPT ); Tue, 14 May 2019 22:28:31 -0400 Received: from mail.kernel.org ([198.145.29.99]:53542 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726283AbfEOC2b (ORCPT ); Tue, 14 May 2019 22:28:31 -0400 Received: from gandalf.local.home (cpe-66-24-58-225.stny.res.rr.com [66.24.58.225]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 9B8EE2084F; Wed, 15 May 2019 02:28:30 +0000 (UTC) Received: from rostedt by gandalf.local.home with local (Exim 4.92) (envelope-from ) id 1hQjef-0005My-Fk; Tue, 14 May 2019 22:28:29 -0400 Message-Id: <20190515022747.719887946@goodmis.org> User-Agent: quilt/0.65 Date: Tue, 14 May 2019 22:27:47 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Ingo Molnar , Andrew Morton Subject: [for-next][PATCH 0/5] tracing: Final updates for this merge window Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git for-next Head SHA1: 693713cbdb3a4bda5a8a678c31f06560bbb14657 Jiri Kosina (1): livepatch: Remove klp_check_compiler_support() Linus Torvalds (1): tracing: Simplify "if" macro code Steven Rostedt (VMware) (3): ftrace/x86_32: Remove support for non DYNAMIC_FTRACE ftrace/x86: Remove mcount support x86: Hide the int3_emulate_call/jmp functions from UML ---- arch/powerpc/include/asm/livepatch.h | 5 --- arch/s390/include/asm/livepatch.h | 5 --- arch/x86/Kconfig | 11 ++++++ arch/x86/include/asm/ftrace.h | 8 ++-- arch/x86/include/asm/livepatch.h | 8 ---- arch/x86/include/asm/text-patching.h | 4 +- arch/x86/kernel/ftrace_32.S | 75 +++--------------------------------- arch/x86/kernel/ftrace_64.S | 28 +------------- include/linux/compiler.h | 35 +++++++++-------- kernel/livepatch/core.c | 8 ---- 10 files changed, 41 insertions(+), 146 deletions(-)