From patchwork Tue Feb 6 01:48:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 197136 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:168b:b0:106:860b:bbdd with SMTP id ma11csp1264165dyb; Mon, 5 Feb 2024 17:49:15 -0800 (PST) X-Google-Smtp-Source: AGHT+IEpbN4VrsG2G7HcqluyafkX9fmMr6N69koQCei9oV9cbrss5Ild6VfdIwilV6CS5vzOxGld X-Received: by 2002:a25:361f:0:b0:dc2:2799:981a with SMTP id d31-20020a25361f000000b00dc22799981amr273288yba.18.1707184154910; Mon, 05 Feb 2024 17:49:14 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707184154; cv=pass; d=google.com; s=arc-20160816; b=O5Mhrrw84yoi8SJP1bjvO0c3N/wRjYKheDGAvnS/NKcShkf+NotSiS/H1So6pLdT8g u1u4Bu7K0dpxY9mRdZgrB4ecPw07r0K+6ZdwL2Pz/SYpwdRRWo/wDbT2PYk0LjBFzrdW PCn3oCWGyucl2zJO9hCDKMdfKQX9BxUVKJ8xt7kD4Im5COk5IR7TvxeQBbPKf+5Vx5uB ADU//PvvnyAN7nMNbORjInvKTHbGZaFGOGeGsbdopo9KQu8Bk4hCww4eXanu0XatTcl+ XDtCsJ/BsBpMrlR6r6IthjI54zSqmLS1Fd21DKwjKIz3odhLhyODpYl/BKJK6xgMEw1x MHyQ== 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=WzsXiNNKB4NmRGTpIGfaSGaM5x0AzChJVK0ybEpCxf8=; fh=mWGD0CWoHJYLt6VQbbApf8e+OxHJi0dfiWP5XcMMnKM=; b=zs0XltRqNjGqLxVXdX4jZKbHcrgWjHk/hQuUcn3CSZmkePYUMbM2aJzao7R3Nbpqki Q7DiQxib4Rh/6tVWXA9tGTg66+A95siJ4MLQTjsPNVZWRd6HpvxRXuvnaQudT3wLDojs sHEwVFnWk1849yx8egsHkUL2ecyse5Sk1XgjjK+b/rMOq3nGnECqi1sxNG4G+QllmkS0 ZBFtz+OiLJ7rpSQ2dJTWjnCfpfg4ylmajgAnZC6Os6I2xR+N/5VCPI49TzuQ+4+x38xf 29AazuoOLkzmhorn+LJgsExAEkqznoqQPq1H6Y+FgRW0a3TBP9TK6P4leU2qPiDq3cAM WQnA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=BPUcxvTJ; 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-54168-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-54168-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au X-Forwarded-Encrypted: i=1; AJvYcCX8nua6bq13YkoFfbxx7Tku3tTlT0Ndlv23ZR9kNl15mhpR+5CnmlWnCxm+oQ6Ot60KKvrNwetIbUI8jbS1PGgAF4e5YA== Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id g22-20020ac85816000000b0042c1db59d4dsi1317657qtg.108.2024.02.05.17.49.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Feb 2024 17:49:14 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-54168-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=BPUcxvTJ; 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-54168-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-54168-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 ny.mirrors.kernel.org (Postfix) with ESMTPS id AF3EA1C23971 for ; Tue, 6 Feb 2024 01:49:14 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 57AE956B63; Tue, 6 Feb 2024 01:49:03 +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="BPUcxvTJ" 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 0254756757; Tue, 6 Feb 2024 01:48:56 +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=1707184140; cv=none; b=RSl1udqDZMmmMvNyXBvz9dxf3NAF9fZ7HFVvP3SZMt5Hmlvo+dkyTj8GvYsttv8Y3AYC2TTdzP2aGxCrx5V1mGxhRUWdzsq9guuPYVamEmhJkamLSCwjzGQj30Nddbm7PjDf85BuyGeL0CbSzozcM/U1pVo4V3raqCroKySIRus= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707184140; c=relaxed/simple; bh=hqIHF8ItYDKFpuclvDRmaeWoAmrK3v+Ya7wiLubCuSg=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type; b=iUgV0CZ/hI+eNOfjXRxKCYZO/pFLvViz1erlsmEnJuSwszHnWMdxR0y9b/rWJyQDqlmg7XR4Mk+f/EH9BpHC8FJGvFtItyvrcAOv7y3l7Whv39RlP5hl5jVL69S0V0POaB8/DTKeslLcBHBpCtM2Zci9XK1z7BaNRAXlARtR4gk= 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=BPUcxvTJ; 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=1707184135; bh=WzsXiNNKB4NmRGTpIGfaSGaM5x0AzChJVK0ybEpCxf8=; h=Date:From:To:Cc:Subject:From; b=BPUcxvTJUIvzT83R3FGTemqP99Be6WAIdWVx3vnqxdD77Hm3+vZHWCFwG9pCc6U01 RSVufkuBFlHSysLoeMaHxhD7dR6haoDgZ4YjFtUFjH0WeXOv7Z0AgouBlSEpWAa4vU AHLICBLtPkMGRgTGlkSyDN5z1Fr7dGhheZyD5hz3mhvvPlzvS3nFMgYa74rcS0DBR9 zFunwZGiiV9Ck03Sj+d3ipNNdWHPodasmvUJOCf+aeoyNlccbczbM5EI/iADKiVg0F vLogMpbw6o8Y5qrUoKG/BuBVrgdCfuU+CsKC2c2QfRF/uyem8OprL+Y5vVP03cmv+B vMMf3ogPinfPg== 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 4TTR466s9mz4wcJ; Tue, 6 Feb 2024 12:48:54 +1100 (AEDT) Date: Tue, 6 Feb 2024 12:48:52 +1100 From: Stephen Rothwell To: Jens Axboe , Christian Brauner Cc: Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the block tree with the vfs-brauner tree Message-ID: <20240206124852.6183d0f7@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: 1790112332282537753 X-GMAIL-MSGID: 1790112332282537753 Hi all, Today's linux-next merge of the block tree got a conflict in: block/blk.h between commits: 19db932fd2b0 ("bdev: make bdev_{release, open_by_dev}() private to block layer") 09f8289e1b74 ("bdev: make struct bdev_handle private to the block layer") d75140abba91 ("bdev: remove bdev pointer from struct bdev_handle") from the vfs-brauner tree and commits: c4e47bbb00da ("block: move cgroup time handling code into blk.h") 08420cf70cfb ("block: add blk_time_get_ns() and blk_time_get() helpers") da4c8c3d0975 ("block: cache current nsec time in struct blk_plug") 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 block/blk.h index f02b25f22e8b,913c93838a01..000000000000 --- a/block/blk.h