From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 20 Apr 2026 22:42:18 +0000 (-0700)
Subject: Merge tag 'printk-for-7.1' of git://git.kernel.org/pub/scm/linux/kernel/git/printk... 
X-Git-Tag: v7.1-rc1~68
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=b66cb4f156fe47f52065e70eb1b2f12ccd0c2884;p=thirdparty%2Fkernel%2Flinux.git

Merge tag 'printk-for-7.1' of git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux

Pull printk updates from Petr Mladek:

 - Fix printk ring buffer initialization and sanity checks

 - Workaround printf kunit test compilation with gcc < 12.1

 - Add IPv6 address printf format tests

 - Misc code and documentation cleanup

* tag 'printk-for-7.1' of git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux:
  printf: Compile the kunit test with DISABLE_BRANCH_PROFILING DISABLE_BRANCH_PROFILING
  lib/vsprintf: use bool for local decode variable
  lib/hexdump: print_hex_dump_bytes() calls print_hex_dump_debug()
  printk: ringbuffer: fix errors in comments
  printk_ringbuffer: Add sanity check for 0-size data
  printk_ringbuffer: Fix get_data() size sanity check
  printf: add IPv6 address format tests
  printk: Fix _DESCS_COUNT type for 64-bit systems
---

b66cb4f156fe47f52065e70eb1b2f12ccd0c2884
diff --cc include/linux/printk.h
index 54e3c621fec37,1a33b813808ca..f594c1266bfd4
--- a/include/linux/printk.h
+++ b/include/linux/printk.h
@@@ -801,21 -801,9 +801,22 @@@ static inline void print_hex_dump_debug
  }
  #endif
  
 +#if defined(DEBUG)
 +#define print_hex_dump_devel(prefix_str, prefix_type, rowsize,		\
 +			     groupsize, buf, len, ascii)		\
 +	print_hex_dump(KERN_DEBUG, prefix_str, prefix_type, rowsize,	\
 +		       groupsize, buf, len, ascii)
 +#else
 +static inline void print_hex_dump_devel(const char *prefix_str, int prefix_type,
 +					int rowsize, int groupsize,
 +					const void *buf, size_t len, bool ascii)
 +{
 +}
 +#endif
 +
  /**
-  * print_hex_dump_bytes - shorthand form of print_hex_dump() with default params
+  * print_hex_dump_bytes - shorthand form of print_hex_dump_debug() with default
+  *                        params
   * @prefix_str: string to prefix each line with;
   *  caller supplies trailing spaces for alignment if desired
   * @prefix_type: controls whether prefix of an offset, address, or none