From patchwork Fri Aug 9 13:28:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alice Ryhl X-Patchwork-Id: 13758819 Received: from mail-yb1-f202.google.com (mail-yb1-f202.google.com [209.85.219.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5C5F0194C93 for ; Fri, 9 Aug 2024 13:28:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723210127; cv=none; b=IAuNDaEo6Ergkt1kRe4A69Cf724nVIz4qzBags+2uzbrRcqNLAawJTZd0x1HnMJK7z/9oNbrVbJUw+e6i0zzGkyfp+OJrlb6TujtWWkaNQg5qzOb1RiLkKRv0U366HB5wnqHkdDZTjt+UrIM/nsc7LmxJXfD3n/lv9U0qSKZPNY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723210127; c=relaxed/simple; bh=TKrlbvQ2RBE1CAygDIaFqr2REf5/DdScuXMZOsqWBGY=; h=Date:Mime-Version:Message-ID:Subject:From:To:Cc:Content-Type; b=Vj292IX7diNGTcnXHHMwLNL6pglejC92tVWnjvEM1yLk1Mv2Y7ULa4NuL58NFpc60g/mdY5kFIYy9fXEhk3uHEMlon0bAohe78/JX4Xdapg8S4ca242ttRl2iOrmEtcoRUiW7ZLnA4OgYgkiqT5SK/CpDhOBwjdS+uQjiYUilgU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--aliceryhl.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=KVXHPUhw; arc=none smtp.client-ip=209.85.219.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--aliceryhl.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="KVXHPUhw" Received: by mail-yb1-f202.google.com with SMTP id 3f1490d57ef6-e087ed145caso3517806276.3 for ; Fri, 09 Aug 2024 06:28:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1723210125; x=1723814925; darn=vger.kernel.org; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=mEjC4VEg02CeBQFpnsdd9qSm0bn37HEVzOCrEJrAluY=; b=KVXHPUhwhEP2K/9reE0fmUUzuIqeWzuM3hnDvv/X7ggF2NGtV2jijyqOMhZVhhn2p/ NRL3+P0ddmKlHlCKmshqq2P+BXoJOv4pFE3ueppSTTLSN6i7C2BTXLvGGFHo1twutpo3 2GTG4qTH51kZn3EgOZojjxJ9yEYYMDUISSrlxBPp4SmHH+4UYI+Xp7K4843Kn/sX4zaU CaE+hAiUYxAIKOt9bwJi1oXHGf4rTVlHevwXIPCVYBNzS+qu3bSzS9matGEA093OuBwh OgaFJf7kWJs00UNS/g3WY/Xkiq1VXRIX+97GbusCQtOIV244hFs9JdWcMqQctaHclzZz KjKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723210125; x=1723814925; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=mEjC4VEg02CeBQFpnsdd9qSm0bn37HEVzOCrEJrAluY=; b=LUSs9aa+ecjGdcaokyIAAih+hI7j4U4VC7yNLLZIlHENJ9Byyf3qS2x9JfHFsuATr7 zl7bX6Q3czDTENzpWp9HWu2uDTuxPvmPsQwJ4WTavovIgX/dAYBlHNoYhQiAf4hsiC+f 0m1eRuwfTd8vn09hz3R0L03BKWIp1kJ3Tm3V8nCLLLVm9O1UhJF4xBeG45T0mpukhjrL 2nN/EgLtjDfXGTUfbkSvg/s+cQVtNLbOf2e1OH60TjPACbLviOQvgKXuL02f5peyrGVK KTAJmsCyt3Jr5Kafth8nlbYw5KgoFPQS9vAjagqU6WwScSp+nKP69LKsajCLqa7DX5Uf oNGA== X-Gm-Message-State: AOJu0Yx823Wgtcio5GbvfdCKifQeAj2giGOiI8AMLr5uVfCUWqaDE7oR Ttg+xNSFVX79wRMPc6EIs9JYHQNgr/atVnQ9KbqR5uNXJIKIvXmAQFmanoyR0p8qrnlfvLoZZjt OhsBFeXokvTSodQ== X-Google-Smtp-Source: AGHT+IFhPkSX4arFZVxfmCknNV75exeBowe3iFO2iPGRwr9I5E7GBwi1+h3ISvKyUximqYRz+7sMLcahCRDmMkU= X-Received: from aliceryhl.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:35bd]) (user=aliceryhl job=sendgmr) by 2002:a25:d307:0:b0:e0b:958a:3344 with SMTP id 3f1490d57ef6-e0eb9a27b3emr37724276.10.1723210125238; Fri, 09 Aug 2024 06:28:45 -0700 (PDT) Date: Fri, 9 Aug 2024 13:28:35 +0000 Precedence: bulk X-Mailing-List: linux-block@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 X-Developer-Key: i=aliceryhl@google.com; a=openpgp; fpr=49F6C1FAA74960F43A5B86A1EE7A392FDE96209F X-Developer-Signature: v=1; a=openpgp-sha256; l=1382; i=aliceryhl@google.com; h=from:subject; bh=TKrlbvQ2RBE1CAygDIaFqr2REf5/DdScuXMZOsqWBGY=; b=owEBbQKS/ZANAwAKAQRYvu5YxjlGAcsmYgBmthkVGeukdJHM4rXEjs2fvGiX8fDwDb74qbeAC NLHqH9dKJCJAjMEAAEKAB0WIQSDkqKUTWQHCvFIvbIEWL7uWMY5RgUCZrYZFQAKCRAEWL7uWMY5 RopxD/9rjsU5witSF5p+HQFTk/IrWKnpZECfiU0QeqIfbvMGKe6flARIcFMcAC3aP/RbIE7QnAg rDQ8swBeQT8kjgNJWZveU8CLrwrztKuk9l9ytFFDTiSa64XS671+ftwAo6JhCWmKCPyElJvGniU XUrX0r1Ww9IBhCsjnm1dM8q1Wa/6BAtxXBB9ECIC1q53N4TXFXvaV8fKcqq0e9G4CCeITiY7D6m VvhW85siOY7itusPxInWsHW0IDlvTadkk+blz/THctXT7h8EmqsC9RPWZJXMAZ5ueVfNId5tdmE Z98BrLKpnLpQKXWRlyx1mAEOdjT+M0KFvLUJbPNGVQVHgzWJF/O/f9h9xmMbf6k8TiKw1SzOtsT SU3lMG6axUD00Ocy0nTDyZ1NEw0Khp3mL1VIh/tjBdNkFtbvj4a4hntM+8gaaI2Sn/8H9xEze8f 2N1NK3aRf80wjoxOvf5zAfE3XX314E8PgUsO7FUV0ff0yGQN3exkVd8Zj0tUFAFCoA3dbqMiNt+ fQB1jbc8sks+6aDlH+bhpcpKrZG4tybBbvA3PO2hZzQEIDB58URud3dG0XX9+pH8bwF6gfSl1tG jAIAllDF/SSWCdhpLp7xIr780pScLU1VaVUc+NiSfGmepnlPIOoZVFI2x+9GR7oOhxIBFZswUe/ nNOsse3CJQ7Rmuw== X-Mailer: git-send-email 2.46.0.76.ge559c4bf1a-goog Message-ID: <20240809132835.274603-1-aliceryhl@google.com> Subject: [PATCH v2] rust: sort blk includes in bindings_helper.h From: Alice Ryhl To: Jens Axboe , Miguel Ojeda , Andreas Hindborg , Danilo Krummrich Cc: linux-block@vger.kernel.org, rust-for-linux@vger.kernel.org, linux-kernel@vger.kernel.org, Alice Ryhl The headers in this file are sorted alphabetically, which makes it easy to quickly resolve conflicts by selecting all of the headers and invoking :'<,'>sort to sort them. To keep this technique to resolve conflicts working, also apply sorting to symbols that are not letters. This file is very prone to merge conflicts, so I think keeping conflict resolution really easy is more important than not messing with git blame history. These includes were originally introduced in commit 3253aba3408a ("rust: block: introduce `kernel::block::mq` module"). Signed-off-by: Alice Ryhl Acked-by: Danilo Krummrich --- Changes since v1: - Reword commit message. v1: https://lore.kernel.org/r/20240809064222.3527881-1-aliceryhl@google.com rust/bindings/bindings_helper.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) base-commit: de9c2c66ad8e787abec7c9d7eff4f8c3cdd28aed diff --git a/rust/bindings/bindings_helper.h b/rust/bindings/bindings_helper.h index b940a5777330..ae82e9c941af 100644 --- a/rust/bindings/bindings_helper.h +++ b/rust/bindings/bindings_helper.h @@ -6,9 +6,9 @@ * Sorted alphabetically. */ #include -#include #include +#include #include #include #include