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=-4.1 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=no 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 17BE6C433E6 for ; Fri, 17 Jul 2020 09:09:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id AABBD206F4 for ; Fri, 17 Jul 2020 09:09: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="oLUl0yjw" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726446AbgGQJJi (ORCPT ); Fri, 17 Jul 2020 05:09:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51130 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726200AbgGQJJh (ORCPT ); Fri, 17 Jul 2020 05:09:37 -0400 Received: from ozlabs.org (ozlabs.org [IPv6:2401:3900:2:1::2]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BFAB0C061755; Fri, 17 Jul 2020 02:09:37 -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 4B7QL568RYz9sR4; Fri, 17 Jul 2020 19:09:33 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1594976974; bh=stOj+5/wR44kqg7e5KWsFMtJ7j3fab5Xm0QH5Z3Drkg=; h=Date:From:To:Cc:Subject:From; b=oLUl0yjwf3SgyjxwGKidXwfWAaPSJmXhbirCthDkJHBZyVhv0qPWLe/RPzcwT7kXm LpkgVMdg9c8pvD2lVCOiJyzDfrQ1PZyk1Lt78QBltBj6151CWc/TszwH86pC1ZLTiV R14l58508hzr7UvUUFEFVmNxNZjo0Lsxyd1iPeYQMdNBxhYmg5acvxDTPwtJmScxyq 6xgqEYxj8BJtiO1ujG1sqIn3X3tdHTdypKpcWYB0T51C4bgxoQBgiCyV72Q9GkWHTG Yoyw/2Hki/vO5x6kyqaohMlM1foilqR+rc9zh6LL2vDHmjQijktw4hD9hTo3wyCIIK Rc1IIpzW8udjg== Date: Fri, 17 Jul 2020 19:09:31 +1000 From: Stephen Rothwell To: Christoph Hellwig , Michael Ellerman , PowerPC Cc: Linux Next Mailing List , Linux Kernel Mailing List , Nathan Lynch Subject: linux-next: manual merge of the set_fs tree with the powerpc tree Message-ID: <20200717190931.701ddf08@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/MpNvBc7e9h=R5siSPe2jASW"; protocol="application/pgp-signature"; micalg=pgp-sha256 Sender: linux-next-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org --Sig_/MpNvBc7e9h=R5siSPe2jASW Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the set_fs tree got a conflict in: arch/powerpc/mm/numa.c between commit: c30f931e891e ("powerpc/numa: remove ability to enable topology updates") from the powerpc tree and commit: 16a04bde8169 ("proc: switch over direct seq_read method calls to seq_read= _iter") from the set_fs tree. I fixed it up (the former removed the code updated by the latter, so I just did that) 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. --=20 Cheers, Stephen Rothwell --Sig_/MpNvBc7e9h=R5siSPe2jASW Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl8RassACgkQAVBC80lX 0Gwx1Qf/Z/KP87nXilapLrjHPT6fyF4eVhLlF6CMqMmpoMb53PLpyeLE2iObKdqO UQW9zjCF6VaZ/ObFWFeWW4SrNjv/tSD1ICNwrEhaF/KP1Dd5YjwiRQH1ZUmrtZP8 vmL4lZ/WIgjD06tp68YgfrEdGfYrNAzOsIkGp0AVAhE2ZZZDp2ShJ9/3PMeP1Mvk smM6+phD9fgYRHpqncS0FdWsc6akn3oF8h6Buk6fmWRdMYl7D7Ma3V78kDuD6gaE kcBrBOSmudY+Klftbm8cJPyV04asC2JisLFXa0PgcieLhwxvKmIJg9NTQrUqECCL o/lrNLSeWae2d2w8uCZDBkgvSKojlw== =Rcfh -----END PGP SIGNATURE----- --Sig_/MpNvBc7e9h=R5siSPe2jASW--