From patchwork Thu Dec 7 02:42:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 174891 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp4516568vqy; Wed, 6 Dec 2023 18:42:47 -0800 (PST) X-Google-Smtp-Source: AGHT+IFrVk/SOOX6vM7Vxum8GKDNzUNhmEh4XwLh1tGXWjH6SH+RISCAGbZmoW64EqWFjUm7NXJj X-Received: by 2002:a05:6a20:7f98:b0:18f:97c:8a33 with SMTP id d24-20020a056a207f9800b0018f097c8a33mr2475742pzj.94.1701916967048; Wed, 06 Dec 2023 18:42:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701916967; cv=none; d=google.com; s=arc-20160816; b=Ce2OkzHqhae1xhuZ7e2TeVSVDv6v7JNF17lQMc2IHBiSKBds8bvhnBBuXHQjAH4vNs IElmqpeqqqhdyVeE4OHewOCiyUrdSW5KwZSDCRB+oBzukHgTW8V4/agl1trugvuN6Clm v7dbtE+UAsIaJ1WzOhEz1CM3a5AmXzH0ucGHT3PwDHjH/RGFqJ9J2c0qhZItCVKHnfHK G1V0fAe4k5BQXCxKj6pTpHT6efoUdZd09tTL+9oh8meI/epO/g/DJ2YnWXLf+OI7NbUg mCKYt3p5eDeDVQ73BNVUh5W9Def/E7/PqcqHpcwtKyKGekXXKjNJsWl6q7tCpwoputi1 VsbA== 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=QXzk8ooLKZc++zfzdWQzkS/rYyXwsM96nMEiVA0ZJCw=; fh=dtZegdUKQ/Ou09omXtvgzwW0wUIpY13SAKGNxwMVmB0=; b=gftCZOG9ZtRD1UBJ4qTcB5aI/ljtvPH16VRhLctpHZ+NbalpSHUBHJZtrUU4bbfpTV 6iIfMwLSxh4B+V5C+u+KMg7vCTZjUT1N9+FDsKURxVvb7gxX/pHATpg64LyOCpIFGClc GVqUT35IpZjcvy/y0ZmPBjmwtmSwbWLz5b1t+JzGMLmlhgsy9poRCQawIrBDl+90Bgjm 0rjjLfU2X1RAwJFx/0YPHx2kdZaNlhqyFgZHCMQzB6Zz+4YQBsK5XxKxRzImb9n3p7+6 23YBGte+BKBUngKHNUO5HH0vWwR8xMwyTIT4Vx3gawl6YElh7xmKEnYkS2D5eox4NrBX 4alQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=hVSU844p; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 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 pete.vger.email (pete.vger.email. [23.128.96.36]) by mx.google.com with ESMTPS id c10-20020a170902724a00b001d0a57bb52csi251428pll.480.2023.12.06.18.42.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Dec 2023 18:42:47 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) client-ip=23.128.96.36; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=hVSU844p; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 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 (depot.vger.email [IPv6:2620:137:e000::3:0]) by pete.vger.email (Postfix) with ESMTP id DB4BC81F3661; Wed, 6 Dec 2023 18:42:41 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1443117AbjLGCmP (ORCPT + 99 others); Wed, 6 Dec 2023 21:42:15 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49600 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1443105AbjLGCmL (ORCPT ); Wed, 6 Dec 2023 21:42:11 -0500 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5772CD4B; Wed, 6 Dec 2023 18:42:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1701916935; bh=QXzk8ooLKZc++zfzdWQzkS/rYyXwsM96nMEiVA0ZJCw=; h=Date:From:To:Cc:Subject:From; b=hVSU844p8kxE95UTL+8mD1vV6z+Of9YAlFZy09o1FyzXY64E8PB8kONg1VhzRNtUq WgiZYoHG62UQ70f8e+14Em2taizhe2aggEctYejIfOFjMQnczIC8pPZXv/117aP6Qt 9HulSJ7RHNZi16KoK3hVbg1m+UkVxlKRWYQAfbhlvLlAeVGndMRRNuQ8DQPAlWA2Lx G48CL4LisFKk/MFGZv6rvVG+06HqO38DuaACVc1Yyt2N8Tncqap3cJxXcoa1B2NPWT eB0553X+2wh3hzJY+1M+IxYeXRTdw8IHw8Q6yoNmREFtWOnfh7+0D5Tt0kJVKPZwlM 3ypIqHFGtVHaQ== 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 X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4Slz7p1dnMz4wcJ; Thu, 7 Dec 2023 13:42:13 +1100 (AEDT) Date: Thu, 7 Dec 2023 13:42:13 +1100 From: Stephen Rothwell To: Greg KH , Arnd Bergmann , Andrew Morton Cc: Carlos Llamas , Greg Kroah-Hartman , Linux Kernel Mailing List , Linux Next Mailing List , Nhat Pham Subject: linux-next: manual merge of the char-misc tree with the mm tree Message-ID: <20231207134213.25631ae9@canb.auug.org.au> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on pete.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (pete.vger.email [0.0.0.0]); Wed, 06 Dec 2023 18:42:42 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784589285587408864 X-GMAIL-MSGID: 1784589285587408864 Hi all, Today's linux-next merge of the char-misc tree got a conflict in: drivers/android/binder_alloc.c between commit: 8b59d7857c30 ("list_lru: allow explicit memcg and NUMA node selection") from the mm tree and commits: ea9cdbf0c727 ("binder: rename lru shrinker utilities") ea2735ce19c1 ("binder: refactor page range allocation") (and maybe others) from the char-misc 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/android/binder_alloc.c index f69d30c9f50f,a4a4dc87ba53..000000000000 --- a/drivers/android/binder_alloc.c