From patchwork Wed Feb 14 00:25:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 200763 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:bc8a:b0:106:860b:bbdd with SMTP id dn10csp901787dyb; Tue, 13 Feb 2024 16:45:27 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCU6u7dWE222FFDq718wnAQKco869EIWKUJG3Fhw4lN2kJxrFfvc87uO7zNLN+PvQ+dYjmTaM9lqvkFrPTlGvzSFIPT42w== X-Google-Smtp-Source: AGHT+IGOnmUwMhPfaGCSSuJR7CnS/SgGZ/3bvVwu/hT3LGMhqxAW/xLZ1HV86xE+2EzlQHJuJYDx X-Received: by 2002:a17:902:db11:b0:1d8:f6af:77db with SMTP id m17-20020a170902db1100b001d8f6af77dbmr744298plx.12.1707871527698; Tue, 13 Feb 2024 16:45:27 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707871527; cv=pass; d=google.com; s=arc-20160816; b=Dd4CaDBFA/w1GF7JUzUwMFc0PdIybCcb509qcwbcjtILKXgYD0UAHUGJgRThO9Vxzv VeNVnV8emfyC7KTd8jQELqBa07x4+TwdkygUq8bQBuyRKyMeh/9GYAyYSQLsIlIdZoM/ Vu1iqlq2LSxDlAxkadnLVe/ScXuT1cgKntAyNKinnCTEP8oHSiejfquz7PvA9KSHTzhh sbAaC5hPoBjjUUWxi5w4BRHaFLhDxfDjOi28jr95ICCZC+sgvYTzgSSk3llW/I4W0wW6 pTXPk1WOpbc72eh5UDAVykxlsbkPh9DfyZR68VXGxftXtdtY6T1+QRBvNdrGqG10Wybh fjNg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:list-unsubscribe:list-subscribe:list-id:precedence :message-id:subject:cc:to:from:date:dkim-signature; bh=T9rHeq/WjASCf4FMqrpZrCbxQNqDKMlgq3tzgKIB91I=; fh=CxoQk0XdRYtPAloh1Vesn/DHN0OIqnIjStcZUQjU0/Q=; b=I11zd86hpo6anO7rEnQUcqTkakfj7iMk0b2ZTA6kIFdHSNq2gjASh4tRFwo/d++4Rr ng5jcGEDoOdX5KWCMTTHs/uM3EHwHq3RG9GOHs2YORG/mfpjwRYZNdzYqv1WrNi52m1z PVL3ehFMYBf2Hcn4VCqztkOPJXQ9bBqeLVsKYP5RkWEZ4VOxnqWPEEXOKseaNS/zNVHm 4Dhl+kRPJ8vK0liIQiZh4P5Q87yFPrE9rxGfqoeBJ0DeP6ktLKlcRZ+S1qbHN/Z5lgQX aQpEizewKxT7iO198FCQRbdu6VHHsk7h1Qc2AfM3GyC/51AgfP8pOmgjFlXE6QbictLg B3wA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=IwxEmGvy; arc=pass (i=1 spf=pass spfdomain=canb.auug.org.au dkim=pass dkdomain=canb.auug.org.au dmarc=pass fromdomain=canb.auug.org.au); spf=pass (google.com: domain of linux-kernel+bounces-64608-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-64608-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au X-Forwarded-Encrypted: i=2; AJvYcCX+8etLWZYlPdjvpVSw13WvewX/YXeQafzU1rwIysuvmCAGBmR1qAhYy4CUHDMrGvsvl8VIPYT8xUzjkS7h34us5Psy6A== Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [147.75.48.161]) by mx.google.com with ESMTPS id f21-20020a637555000000b005ce087e004dsi2771730pgn.799.2024.02.13.16.45.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Feb 2024 16:45:27 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-64608-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=IwxEmGvy; arc=pass (i=1 spf=pass spfdomain=canb.auug.org.au dkim=pass dkdomain=canb.auug.org.au dmarc=pass fromdomain=canb.auug.org.au); spf=pass (google.com: domain of linux-kernel+bounces-64608-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-64608-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id 965D7B235BD for ; Wed, 14 Feb 2024 00:25:45 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id A068FAD48; Wed, 14 Feb 2024 00:25:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="IwxEmGvy" Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9F0899449; Wed, 14 Feb 2024 00:25:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=150.107.74.76 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707870329; cv=none; b=e7DxbqWbG0KGAik2g6idsoheNgdYqoXAXCgpVsrOPRFF/Shf5OZGEy1OfqORTYIJqky598jDX7f2ZuEeU+jz9OiiqE3lSF1v4lYnmwjiHEYiZnZoKbLn6LmzSoBfTrMTbBnRFE6uxisiUtNIo6jq6lC/8pj8Dn6Ou3AFgmFwWqM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707870329; c=relaxed/simple; bh=ZYz52E5UpZ22syPUWwTv63Zl55ZRM/Eb3jbRBRiXYFg=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type; b=C7ncQ5nbN/6I420jr0OdYrZanVj1PuTd7FVc4o8pvI2g1hfPJMwI6w1SrpjVxz6Nav4ZtVtc+G19cb/QZaZ+Aar7VitAOjZ/WKLZcK6NuZS2Zw9FvmS55WWWkujhZxk/Jy/ZWjRMwe5JO27icFruEd5dFPRNfemOt1NmSkUyEZI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au; spf=pass smtp.mailfrom=canb.auug.org.au; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b=IwxEmGvy; arc=none smtp.client-ip=150.107.74.76 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=canb.auug.org.au DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1707870321; bh=T9rHeq/WjASCf4FMqrpZrCbxQNqDKMlgq3tzgKIB91I=; h=Date:From:To:Cc:Subject:From; b=IwxEmGvySQgBt4zTPvnibksanFVd3+ymF8wR5Bsnoo04QBHevmnkzrxILLFyUgsuo fL+kQI/XpHo7uCtYtfJR9Sp0p/5AgHbRRzC+NqO30bXFrgPwmmB55wyHfAyg6L9gDc L+WPVExXdJWXHQl/B5xD8w/THKBmmtOt7k1viPFg32Gj3Ak1RshZSwOzfVC+vCL9Ak 7bi4xY6t1hasNv0zSPlGZedDbEYp/u60jLROtj+jjuySILNn5mZlk3B++Qd0U4bhxD wcGOVH3LoirgULptEYHClPJOiSFpo9Oy0AAYI7U5lzJ+S39fN6nGzwQfL8VYqjRin9 5AoSAzEDrjrYA== 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 4TZJr10B39z4wcr; Wed, 14 Feb 2024 11:25:20 +1100 (AEDT) Date: Wed, 14 Feb 2024 11:25:19 +1100 From: Stephen Rothwell To: Jens Axboe , Andrew Morton Cc: Linux Kernel Mailing List , Linux Next Mailing List , Vlastimil Babka Subject: linux-next: manual merge of the block tree with the mm tree Message-ID: <20240214112519.153c8480@canb.auug.org.au> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1790833095063725001 X-GMAIL-MSGID: 1790833095063725001 Hi all, Today's linux-next merge of the block tree got a conflict in: include/linux/sched.h between commit: d9233ee073c9 ("mm: document memalloc_noreclaim_save() and memalloc_pin_save()") from the mm-unstable branch of the mm tree and commit: 06b23f92af87 ("block: update cached timestamp post schedule/preemption") from the block 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 include/linux/sched.h index 5b27a548d863,15b7cb478d16..000000000000 --- a/include/linux/sched.h