From patchwork Tue Jul 11 01:07:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 118182 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a6b2:0:b0:3e4:2afc:c1 with SMTP id c18csp185238vqm; Mon, 10 Jul 2023 18:45:34 -0700 (PDT) X-Google-Smtp-Source: APBJJlFRw/qHubF6xcwu4AW/Ayh71ZffusMfiHngk+FiXqRL8RO+6r9DqSkmOXjWmCP+BoJeypYl X-Received: by 2002:a05:6a20:160d:b0:106:25b3:2f92 with SMTP id l13-20020a056a20160d00b0010625b32f92mr14290962pzj.52.1689039934235; Mon, 10 Jul 2023 18:45:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689039934; cv=none; d=google.com; s=arc-20160816; b=UXnu3lMzIaBrNdyKekJ2L16z2gkibmOM/9b/P6zFftD7G2kMwNX2R1KXeX2EvwxOrg FeYJJV5kkRja3Mw8V+GZeXBDJ7kVE4DZ/8pWvF19ZerxS7jAcdOxzp4nhU23EUUjKjN/ M0vO6GzYReDXYR8Gm8+kdLwE/f2n2YB4Byp7laQLx/PUdayjm/qql2+kskDWtv/6C6WT WlC+1q1Rb0YdcFyBpzpqhELR/27mCK9p3xH8Q8WXWz/jr/1lMXCkY6v+el6ryiu3mws1 w3PC6F5coeteJqdeWMV8v6aDkSYrpLle64sEUMJL8u8E2vyuuCsRL4jsvS3/P2hVT8Of ie3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:subject:cc:to:from:date :dkim-signature; bh=bEugtFsBjYWlNrUnI+PYUCIXHBfzwDrWOXSQ3VqJJfM=; fh=zbiUWw22qv4upQOPOYgCtSGA7fhWbU2ZZWVbKACfvJo=; b=acYSSiWJQ0Z+BNbiAEYIDNMoHCaUFHGztdWDxKsQwscbdbPOUb3hXWoDK9pgpi5rSj anirDJpvLuSk5g9BFAB3kJn8oDax01g6488fDRHijmParFuoO+/6CwumUcHdJs0uPQt0 2HRAH0Y4HOG5DkzrAoaIUwzNBHtZoHdxijEcrSRsXJ7L2w1bb4AVln4WWhXcy7dJjNnw AqZRivzhUTsQ7ugH5H5Ajqdf6Ug/2Rtq1rhQ8c7vY4+BMPyZ/LeG+FRAKVd1j+6fLZYi HaNQ91bZ0FEgoN9OK4nF+EDe/2h12RBHr3khGbLQIOrtXKtCu6zVCsLngggSpnQyXK/i ID+g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=P9taIQQt; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id kq5-20020a170903284500b001b8b0c1650esi674665plb.63.2023.07.10.18.45.21; Mon, 10 Jul 2023 18:45:34 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=P9taIQQt; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229655AbjGKBHl (ORCPT + 99 others); Mon, 10 Jul 2023 21:07:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49828 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230459AbjGKBHk (ORCPT ); Mon, 10 Jul 2023 21:07:40 -0400 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C0F961A2; Mon, 10 Jul 2023 18:07:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1689037656; bh=bEugtFsBjYWlNrUnI+PYUCIXHBfzwDrWOXSQ3VqJJfM=; h=Date:From:To:Cc:Subject:From; b=P9taIQQtF2Twj357LNlcb2SK3AMB1nq+FCGW6GSt01hhQaR7lPRwjxUwf6VxtQBJJ SJERtdL2Z8UpTNisi4MzIVBPMZKq90ibbW8znniiB6JDU3o7ukbdi1KMldfaY7wjMC V4ELipkDtgJ8v4QVRo4WTgt9+OOYdV/6ue/YL5YLiRQFRVBET8pyzBsQ3jOfvM3drc yzyJc14Ty4BaaC09AXoWnchemXC+TSr3kf5B5NuLoQ871b1anJHEV9ot4f6mG4Tbi7 71Dhf71ASioL4atFbsD7EIldjv5B0w137M0Fc2HUIbGtUoyOJFokzwSrA3BHGy3q96 hRgBipQkOEjig== 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 (prime256v1) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4R0N5M65Sjz4whq; Tue, 11 Jul 2023 11:07:35 +1000 (AEST) Date: Tue, 11 Jul 2023 11:07:34 +1000 From: Stephen Rothwell To: Tejun Heo , Andrew Morton Cc: Domenico Cerasuolo , Linux Kernel Mailing List , Linux Next Mailing List , Michal =?utf-8?q?Kout?= =?utf-8?q?n=C3=BD?= Subject: linux-next: manual merge of the cgroup tree with the mm tree Message-ID: <20230711110734.7009339b@canb.auug.org.au> MIME-Version: 1.0 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771086738050590811 X-GMAIL-MSGID: 1771086738050590811 Hi all, Today's linux-next merge of the cgroup tree got conflicts in: tools/testing/selftests/cgroup/.gitignore tools/testing/selftests/cgroup/Makefile between commit: 479a748978d2 ("selftests: cgroup: add test_zswap program") from the mm tree and commit: cd3c6f682df4 ("selftests: cgroup: Add cpuset migrations testcase") from the cgroup 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 tools/testing/selftests/cgroup/.gitignore index 4d556df4f77b,8443a8d46a1c..000000000000 --- a/tools/testing/selftests/cgroup/.gitignore diff --cc tools/testing/selftests/cgroup/Makefile index 27dbdd7bb4bb,dee0f013c7f4..000000000000 --- a/tools/testing/selftests/cgroup/Makefile