From patchwork Wed Apr 29 06:45:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 1279005 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.a=rsa-sha256 header.s=201702 header.b=dUKnaEFo; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49BptF6plKz9sT1 for ; Wed, 29 Apr 2020 16:45:25 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726676AbgD2GpX (ORCPT ); Wed, 29 Apr 2020 02:45:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45244 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726274AbgD2GpW (ORCPT ); Wed, 29 Apr 2020 02:45:22 -0400 Received: from ozlabs.org (ozlabs.org [IPv6:2401:3900:2:1::2]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EE58CC03C1AD; Tue, 28 Apr 2020 23:45:21 -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 49Bpt53PpVz9sSy; Wed, 29 Apr 2020 16:45:17 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1588142718; bh=3cMRdLL9NxF4buj+57KowqZUgvkJHk/Zf4rhGSm4NDg=; h=Date:From:To:Cc:Subject:From; b=dUKnaEFo8k+w1MYkeApOzlBgyLSM9LyOF9J5JG89pi8xZVypitag3ErY96jeNIrbP KLKBcFIaoJe88CHKUsCR+KaiGslWlJsAV06JsgEw60OP4kISJltHY+Wzm+L6dioX9d 7TZC0PBfDhS6W67y31ZNhCtWWOksPtEL0IsuuZtfYoEVH7wIhnQeo0vhab0JBsTw4b B+g28z05Q+0ZzVGm2AJYzQzREk/exTjBn1mvy0uN2zO9r87bj0ep1aUoXPRptY95wQ UkfH+LiLrQT6FCP6U0D/y6lzajI89QVbvQGxCWHnsILX6V6ZoOClUMMeLbpf0SrfLr CiXgQJwLGAhKA== Date: Wed, 29 Apr 2020 16:45:07 +1000 From: Stephen Rothwell To: Andrew Morton , Daniel Borkmann , Alexei Starovoitov , Networking Cc: Linux Next Mailing List , Linux Kernel Mailing List , Christoph Hellwig , Al Viro , Xiaoming Ni , "Guilherme G. Piccoli" Subject: linux-next: manual merge of the akpm-current tree with the bpf-next tree Message-ID: <20200429164507.35ac444b@canb.auug.org.au> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Hi all, Today's linux-next merge of the akpm-current tree got a conflict in: kernel/sysctl.c between commit: f461d2dcd511 ("sysctl: avoid forward declarations") from the bpf-next tree and commits: 0fe73f87ba37 ("parisc: add sysctl file interface panic_on_stackoverflow") 631b6d13906c ("kernel/hung_task.c: introduce sysctl to print all traces when a hung task is detected") 0defdd249368 ("panic: add sysctl to dump all CPUs backtraces on oops event") from the akpm-current 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 e961286d0e14,d6e728e3e99f..000000000000 --- a/kernel/sysctl.c