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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6147AC6FD1D for ; Tue, 21 Mar 2023 14:42:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231222AbjCUOm5 (ORCPT ); Tue, 21 Mar 2023 10:42:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41638 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230492AbjCUOm4 (ORCPT ); Tue, 21 Mar 2023 10:42:56 -0400 Received: from mail-yw1-x1130.google.com (mail-yw1-x1130.google.com [IPv6:2607:f8b0:4864:20::1130]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 655CA4ECED for ; Tue, 21 Mar 2023 07:42:54 -0700 (PDT) Received: by mail-yw1-x1130.google.com with SMTP id 00721157ae682-5454bc2276dso29614307b3.5 for ; Tue, 21 Mar 2023 07:42:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; t=1679409773; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=KtPwkY/8VKMjRpZP8nkE6+KZh9AWGMgm4pAyQ2A8hVM=; b=FII/3p0k8pjrZHGDKphWpd7fUhCUOD9TVyjqLi4tM6OJ8yYht3gJybn1gnqnlHfMYB SYScvVhv9xnr8ezXeWHguSZ9HSxmimA/MjNmMv6FxevTxmVW2UtxMBAxeDcxL8fnsWG/ NVcHHTwGEPs9srNVotYsjxltm68oFhd9CdC6BuZwavkPVUteX/3qJw7rWbxEmSMgAvm8 r6p6YBkCTj6CKxzfIjUNmioe3pPqsl5eXoDuW6zlNS4lwqo9LTjTDSFpK6AFo9x7UA9B XmySarRca1OALqwKGNKzJm9l7arueZNM/MfN+iEy4o2+gPk6EGOlK1pJyaLj6YdZorte mqnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679409773; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=KtPwkY/8VKMjRpZP8nkE6+KZh9AWGMgm4pAyQ2A8hVM=; b=PL9S8AkPYDmwgBN/VQxlaJk4K1C9NmnP6TERm+nNJFNNhf2ms1CAh/F+lhgmWrCcys ELu4VSnCxxpF4SmfyhdVyl7Jv96UnT1SvoWr5O2kvQSGvwiyUe31EuMhPpJZGNgeBq4V LvAQhzGEbSbLq8uq193QsJ2/1ZgyGIeMNjJn6zTWZweWZUfP8pOkesnbqW9PEF/3ogYz l5xsRqaxTUa8sLzH3U49YfGH/s5rd6GMa5CdD2FvUCHNyx75MYDEj7yHU7RFOpRLE6Hs PwX86/dJNePVQzDTAMqNG9o0xZ51WTN24EY2tboq1DXZDlNJmDusF5aKYMZHkjJbIcnz XWAQ== X-Gm-Message-State: AAQBX9ctXVMhBsH61Bm3f5lIxKJzdvDUMYWMWCNMmaoACm/AYemRIkQA +LCqcOV/mYAbeEqF8kWr8wF9WBOvPtgc3+YwQV0CFEog+c0CEJy+XRU= X-Google-Smtp-Source: AKy350YiBo4gj35uuLlpHRCbAICvQZFyf4Q+EQjhiIv5FG8Ep4/T1OExCBbDtBy02JODvfTnzdwO7Epd4eR+yRjIh8g= X-Received: by 2002:a81:764f:0:b0:543:bbdb:8c2b with SMTP id j15-20020a81764f000000b00543bbdb8c2bmr1199639ywk.10.1679409773530; Tue, 21 Mar 2023 07:42:53 -0700 (PDT) MIME-Version: 1.0 References: <20230321132052.7d12fd7d@canb.auug.org.au> <20230321132227.5f63cd43@canb.auug.org.au> In-Reply-To: From: Jiaqi Yan Date: Tue, 21 Mar 2023 07:42:42 -0700 Message-ID: Subject: Re: linux-next: manual merge of the sysctl tree with Linus' tree To: Stephen Rothwell Cc: Andrew Morton , Luis Chamberlain , Kefeng Wang , Linux Kernel Mailing List , Linux Next Mailing List Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org On Mon, Mar 20, 2023 at 10:41=E2=80=AFPM Luis Chamberlain wrote: > > On Tue, Mar 21, 2023 at 01:22:27PM +1100, Stephen Rothwell wrote: > > Hi all, > > > > On Tue, 21 Mar 2023 13:20:52 +1100 Stephen Rothwell wrote: > > > > > > Today's linux-next merge of the sysctl tree got a conflict in: > > > > > > mm/memory-failure.c > > > > > > between commit: > > > > > > 44b8f8bf2438 ("mm: memory-failure: add memory failure stats to sysf= s") > > > > > > from Linus' tree and commit: > > > > > > cfe7e6ea5ee2 ("mm: memory-failure: Move memory failure sysctls to i= ts own file") > > > > > > from the sysctl 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 t= ree > > > is submitted for merging. You may also want to consider cooperating > > > with the maintainer of the conflicting tree to minimise any particula= rly > > > complex conflicts. > > > > Sorry, I forgot the resolution - see below. Thanks for resolving the conflicts, Stephen. It also looks good to me. > > Oh sorry, its on Linus' tree, so I can just rebase too. Did that and > addressed the conflict as you did, thanks! > > Luis