From patchwork Wed Jun 16 01:47:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 12323751 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=-10.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable 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 7ED90C48BE8 for ; Wed, 16 Jun 2021 01:47:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 61FC361209 for ; Wed, 16 Jun 2021 01:47:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231924AbhFPBta (ORCPT ); Tue, 15 Jun 2021 21:49:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51338 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230454AbhFPBt2 (ORCPT ); Tue, 15 Jun 2021 21:49:28 -0400 Received: from ozlabs.org (ozlabs.org [IPv6:2401:3900:2:1::2]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BD60FC061574; Tue, 15 Jun 2021 18:47:22 -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 4G4Sjg4Wmbz9sXG; Wed, 16 Jun 2021 11:47:19 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1623808039; bh=HqB8/rIQjzzdFHS5jt6c0a5Xbi1MdIsHYatrLuz5Cdc=; h=Date:From:To:Cc:Subject:From; b=LW+1VwgrzRP8aytHjLEhUlUVstdmUc2OKhwzc5/Nyy1jX4URs0zrR8MngViFiJ47o NjsSkPOdbX5pVT1o2Oah76tP6gRhCeV8YCNUCqmpww08Wxw4VIJ6NOnASy57VloJYl 6sAqZmR0NUWr/l5CKTFew/1KkAM7Rdw4kEyxBgS2U00GNW7hKc+hLWPhGcHVws6BiQ JL9v8KZ5WNCse27Kfpgyom8P/3GwJWfHQXFFUtT//DGYEh5r33WKXSl0TbLhOmsGx7 YeGxrZDSPbqyYcs7TXwqAs7K9Pwzehln4h/ePdmj+3vjEc/yI5BTBXABL2bgkq8o2L aDXKHFAxkNWXQ== Date: Wed, 16 Jun 2021 11:47:18 +1000 From: Stephen Rothwell To: David Miller , Networking Cc: Jakub Kicinski , Linux Kernel Mailing List , Linux Next Mailing List , "Radu Pirea (NXP OSS)" Subject: linux-next: manual merge of the net-next tree with the net tree Message-ID: <20210616114718.0e4c2142@canb.auug.org.au> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Hi all, Today's linux-next merge of the net-next tree got conflicts in: drivers/ptp/ptp_clock.c include/linux/ptp_clock_kernel.h between commit: 475b92f93216 ("ptp: improve max_adj check against unreasonable values") from the net tree and commit: 9d9d415f0048 ("ptp: ptp_clock: make scaled_ppm_to_ppb static inline") from the net-next 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 drivers/ptp/ptp_clock.c index 21c4c34c52d8,a780435331c8..000000000000 --- a/drivers/ptp/ptp_clock.c