From 26cc3cf55b8bade9f8bac9c6be6483fdaa8f6aa6 Mon Sep 17 00:00:00 2001
From: Tk-Glitch <ti3nou@gmail.com>
Date: Sun, 24 Jul 2022 17:04:41 +0200
Subject: [PATCH] linux519: Fix bcachefs patchset and silence a config prompt

---
 PKGBUILD                                        |  2 +-
 linux-tkg-config/prepare                        |  2 +-
 linux-tkg-patches/5.19/0008-5.19-bcachefs.patch | 14 ++++++++++++--
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/PKGBUILD b/PKGBUILD
index 29caf25..29a9a5f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -835,7 +835,7 @@ case $_basever in
             '19661ec0d39f9663452b34433214c755179894528bf73a42f6ba52ccf572832a'
             '9df628fd530950e37d31da854cb314d536f33c83935adf5c47e71266a55f7004'
             '057631ecc148b41e0037d200a69cbbfbed8cdcf27eede3d8cd6936566b6ebc68'
-            'ee9889e94dcb2cee098c39e76e27d714c6071c41a85f3d70361a9cf2c25e4cd3'
+            '40e7ecc52af379df1e362b32e5b9827815284dae895328556336cb0d10979b63'
             '9fad4a40449e09522899955762c8928ae17f4cdaa16e01239fd12592e9d58177'
             'a557b342111849a5f920bbe1c129f3ff1fc1eff62c6bd6685e0972fc88e39911'
             'b9822a7f912a46196facb9e70229b90357fbc7c7c1dfe23a407e1cb014add30d'
diff --git a/linux-tkg-config/prepare b/linux-tkg-config/prepare
index 8af421e..bc5f08b 100644
--- a/linux-tkg-config/prepare
+++ b/linux-tkg-config/prepare
@@ -1177,7 +1177,7 @@ _tkg_srcprep() {
        _tkg_patcher
 
        _enable "BCACHEFS_FS" "BCACHEFS_QUOTA" "BCACHEFS_POSIX_ACL"
-       _disable "BCACHEFS_DEBUG" "BCACHEFS_TESTS" "DEBUG_CLOSURES"
+       _disable "BCACHEFS_DEBUG" "BCACHEFS_TESTS" "DEBUG_CLOSURES" "BCACHEFS_LOCK_TIME_STATS"
     fi
   fi
 
diff --git a/linux-tkg-patches/5.19/0008-5.19-bcachefs.patch b/linux-tkg-patches/5.19/0008-5.19-bcachefs.patch
index 9673d36..d85f4e6 100644
--- a/linux-tkg-patches/5.19/0008-5.19-bcachefs.patch
+++ b/linux-tkg-patches/5.19/0008-5.19-bcachefs.patch
@@ -90895,7 +90895,7 @@ index 618c366a2f07..660ddd48267d 100644
  	/*
  	 * Provide statistics on the state of the memory subsystem as
  	 * well as cumulative event counters that show past behavior.
-@@ -1485,37 +1481,37 @@ static char *memory_stat_format(struct mem_cgroup *memcg)
+@@ -1485,43 +1481,43 @@ static char *memory_stat_format(struct mem_cgroup *memcg)
  		u64 size;
  
  		size = memcg_page_state_output(memcg, memory_stats[i].idx);
@@ -90954,7 +90954,17 @@ index 618c366a2f07..660ddd48267d 100644
 +	       memcg_events(memcg, PGLAZYFREED));
  
  #if defined(CONFIG_MEMCG_KMEM) && defined(CONFIG_ZSWAP)
- 	seq_buf_printf(&s, "%s %lu\n", vm_event_name(ZSWPIN),
+-	seq_buf_printf(&s, "%s %lu\n", vm_event_name(ZSWPIN),
+-		       memcg_events(memcg, ZSWPIN));
+-	seq_buf_printf(&s, "%s %lu\n", vm_event_name(ZSWPOUT),
+-		       memcg_events(memcg, ZSWPOUT));
++	prt_printf(&buf, "%s %lu\n", vm_event_name(ZSWPIN),
++	       memcg_events(memcg, ZSWPIN));
++	prt_printf(&buf, "%s %lu\n", vm_event_name(ZSWPOUT),
++	       memcg_events(memcg, ZSWPOUT));
+ #endif
+
+ #ifdef CONFIG_TRANSPARENT_HUGEPAGE
 @@ -1525,16 +1521,18 @@ static char *memory_stat_format(struct mem_cgroup *memcg)
  #endif