diff mbox series

linux-next: manual merge of the slab tree with the mm-stable, mm trees

Message ID 20240102151332.48a87d86@canb.auug.org.au
State New
Headers
Series linux-next: manual merge of the slab tree with the mm-stable, mm trees |

Commit Message

Stephen Rothwell Jan. 2, 2024, 4:13 a.m. UTC 
  Hi all,

Today's linux-next merge of the slab tree got a conflict in:

  mm/kasan/quarantine.c

between commits:

  773688a6cb24 ("kasan: use stack_depot_put for Generic mode")
  435736586ddc ("kasan: stop leaking stack trace handles")

from the mm-stable, mm trees and commit:

  72786c0a3dc5 ("KASAN: remove code paths guarded by CONFIG_SLAB")

from the slab tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
diff mbox series

Patch

diff --cc mm/kasan/quarantine.c
index 8afa77bc5d3b,138c57b836f2..000000000000
--- a/mm/kasan/quarantine.c