From patchwork Mon May 11 01:11:23 2020
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: 11539515
Return-Path: <SRS0=Akd3=6Z=vger.kernel.org=linux-parisc-owner@kernel.org>
Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org
 [172.30.200.123])
	by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7C3D2139F
	for <patchwork-linux-parisc@patchwork.kernel.org>;
 Mon, 11 May 2020 01:11:38 +0000 (UTC)
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by mail.kernel.org (Postfix) with ESMTP id 3ECF420722
	for <patchwork-linux-parisc@patchwork.kernel.org>;
 Mon, 11 May 2020 01:11:38 +0000 (UTC)
Authentication-Results: mail.kernel.org;
	dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au
 header.b="cCFBF1b+"
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1729170AbgEKBLi (ORCPT
        <rfc822;patchwork-linux-parisc@patchwork.kernel.org>);
        Sun, 10 May 2020 21:11:38 -0400
Received: from bilbo.ozlabs.org ([203.11.71.1]:43761 "EHLO ozlabs.org"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1728301AbgEKBLh (ORCPT <rfc822;linux-parisc@vger.kernel.org>);
        Sun, 10 May 2020 21:11:37 -0400
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 49L2vK75Pbz9sSF;
        Mon, 11 May 2020 11:11:25 +1000 (AEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au;
        s=201702; t=1589159489;
        bh=dD8HJf36c5pyarxwp4EEfo+2KGPaI3vuIONOfGlONp4=;
        h=Date:From:To:Cc:Subject:From;
        b=cCFBF1b+LKR726w7T1NStP07v+/lo8WFENA7hJ0sSeTed+kbe1fCSC0uFdDxUD643
         eod+fzlw/A1Fyw0RhGW9Vj3mavvhcsu+MYQ39KkkFxPs9A+G6NGei6cB/4F+4ptXDJ
         nvREk8806hO+s4IeeuUCGOVOyy3W6LDomtiKDCM4VUPTSbxS2XKyheZx84lXp4fcaH
         M4CkRekqWzBwO5WhaT5rx8YzsNvuDf+bruFy8Xe7zFS+IdKaem8KM2s1zAEg0HZmlx
         8JDhbmUU3hFT9G8r7Czlgl2tPI6FRqZ64IvXOCs/Y0T9uevME/Z161+CNMn7oBRlnP
         Mgn9t/bexuNDw==
Date: Mon, 11 May 2020 11:11:23 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Al Viro <viro@ZenIV.linux.org.uk>, Helge Deller <deller@gmx.de>,
        Parisc List <linux-parisc@vger.kernel.org>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Xiaoming Ni <nixiaoming@huawei.com>,
        Christoph Hellwig <hch@lst.de>
Subject: linux-next: manual merge of the vfs tree with the parisc-hd tree
Message-ID: <20200511111123.68ccbaa3@canb.auug.org.au>
MIME-Version: 1.0
Sender: linux-parisc-owner@vger.kernel.org
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 vfs tree got a conflict in:

  kernel/sysctl.c

between commit:

  b6522fa409cf ("parisc: add sysctl file interface panic_on_stackoverflow")

from the parisc-hd tree and commit:

  f461d2dcd511 ("sysctl: avoid forward declarations")

from the vfs 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 kernel/sysctl.c
index b9ff323e1d26,e961286d0e14..000000000000
--- a/kernel/sysctl.c