From c417cbc050345abfecc4d70da706fedba13cf24a Mon Sep 17 00:00:00 2001
From: Anas Nashif <anas.nashif@intel.com>
Date: Fri, 19 Aug 2022 14:57:17 -0400
Subject: [PATCH] clang-format: disable regrouping and sorting of includes

Disable regrouping and sorting of includes which can cause issues due to
order requirements in some subsystems.

Fixes #48520

Signed-off-by: Anas Nashif <anas.nashif@intel.com>
---
 .clang-format | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.clang-format b/.clang-format
index ddcb517cebf..bdeda209bb2 100644
--- a/.clang-format
+++ b/.clang-format
@@ -63,7 +63,8 @@ ForEachMacros:
   - 'Z_GENLIST_FOR_EACH_CONTAINER_SAFE'
   - 'Z_GENLIST_FOR_EACH_NODE'
   - 'Z_GENLIST_FOR_EACH_NODE_SAFE'
-IncludeBlocks: Regroup
+# Disabled for now, see bug https://github.com/zephyrproject-rtos/zephyr/issues/48520
+#IncludeBlocks: Regroup
 IncludeCategories:
   - Regex: '^".*\.h"$'
     Priority: 0
@@ -76,6 +77,7 @@ IncludeCategories:
 IndentCaseLabels: false
 IndentWidth: 8
 # SpaceBeforeParens: ControlStatementsExceptControlMacros # clang-format >= 13.0
+SortIncludes: false
 UseTab: Always
 WhitespaceSensitiveMacros:
   - STRINGIFY