From patchwork Mon Oct 25 04:20:34 2021
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Stephen Rothwell <sfr@canb.auug.org.au>
X-Patchwork-Id: 12580681
Return-Path: <linux-parisc-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
	by smtp.lore.kernel.org (Postfix) with ESMTP id 740B7C433EF
	for <linux-parisc@archiver.kernel.org>; Mon, 25 Oct 2021 04:20:40 +0000 (UTC)
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by mail.kernel.org (Postfix) with ESMTP id 555A560232
	for <linux-parisc@archiver.kernel.org>; Mon, 25 Oct 2021 04:20:40 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S232145AbhJYEXB (ORCPT <rfc822;linux-parisc@archiver.kernel.org>);
        Mon, 25 Oct 2021 00:23:01 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42234 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S229678AbhJYEXA (ORCPT
        <rfc822;linux-parisc@vger.kernel.org>);
        Mon, 25 Oct 2021 00:23:00 -0400
Received: from gandalf.ozlabs.org (gandalf.ozlabs.org
 [IPv6:2404:9400:2:0:216:3eff:fee2:21ea])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F27ACC061745;
        Sun, 24 Oct 2021 21:20:38 -0700 (PDT)
Received: from authenticated.ozlabs.org (localhost [127.0.0.1])
        (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
         key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits)
 server-digest SHA256)
        (No client certificate requested)
        by mail.ozlabs.org (Postfix) with ESMTPSA id 4Hd1w40BBxz4xbr;
        Mon, 25 Oct 2021 15:20:35 +1100 (AEDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
        s=201702; t=1635135637;
        bh=S3HjBwvAVmieJ+oCfj9Rn9VsmQauFDmjC9cGFpwHILM=;
        h=Date:From:To:Cc:Subject:From;
        b=A/txUgTmPr8QYPiPTbORjFTnHSjbLiuojbkAOhzTqoSidtzP9+WBxQOj7cRbQ5f5u
         GJfiEAk2LGpuAGE4r7Nl8yF/pURw6mXge8X7uuh46hCP+k9y/y3PRdAanZj4RIZk7g
         P1Au5RVgA9AwBvBewZmj6WUaRsvQVnP2vCSsu7eB+RE1Pd9XM4rLjkpmw34tKbT41l
         lTNtvI0RRR845nUvXvLmqEEc7S1+DbBf6H4fNLJGu/SQCpDEP7cGOea8tA64NkKQVK
         ImvFHYNReOT1IJerrikbPkC+dVuS2kB0a//KFgwKESdpa3/tOgs3ID4gkkFshWa5UW
         noV2HI2bcMiZA==
Date: Mon, 25 Oct 2021 15:20:34 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Steven Rostedt <rostedt@goodmis.org>, Helge Deller <deller@gmx.de>,
        Parisc List <linux-parisc@vger.kernel.org>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Sven Schnelle <svens@stackframe.org>,
        Weizhao Ouyang <o451686892@gmail.com>
Subject: linux-next: manual merge of the ftrace tree with the parisc-hd tree
Message-ID: <20211025152034.69923d51@canb.auug.org.au>
MIME-Version: 1.0
Precedence: bulk
List-ID: <linux-parisc.vger.kernel.org>
X-Mailing-List: linux-parisc@vger.kernel.org

Hi all,

Today's linux-next merge of the ftrace tree got a conflict in:

  arch/parisc/kernel/ftrace.c

between commit:

  e1e134bf1eb6 ("parisc/ftrace: set function trace function")

from the parisc-hd tree and commit:

  6644c654ea70 ("ftrace: Cleanup ftrace_dyn_arch_init()")

from the ftrace tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

diff --cc arch/parisc/kernel/ftrace.c
index 8b9b8ce95d8d,01581f715737..000000000000
--- a/arch/parisc/kernel/ftrace.c