projects / linux-2.6-block.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 576bb2d 8076972)
Merge tag 'printk-for-6.9-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/print...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 26 Mar 2024 16:25:57 +0000 (09:25 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 26 Mar 2024 16:25:57 +0000 (09:25 -0700)
Pull printk fix from Petr Mladek:

 - Prevent scheduling in an atomic context when printk() takes over the
   console flushing duty

* tag 'printk-for-6.9-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux:
  printk: Update @console_may_schedule in console_trylock_spinning()

1  2 
kernel/printk/printk.c patch | diff1 | diff2 | blob | history

diff --cc kernel/printk/printk.c
Simple merge
Linux 6.x block layer and io_uring tree(s)