diff options
author | Gao Xiang <xiang@kernel.org> | 2024-05-18 01:39:54 +0800 |
---|---|---|
committer | Gao Xiang <xiang@kernel.org> | 2024-05-18 01:39:54 +0800 |
commit | 20c02972ec492f6cbfdd0146940899f2841c2783 (patch) | |
tree | b8931bd85e1f8cf8e09eaff36ba6ffaadc142d87 /scripts/gdb/linux/tasks.py | |
parent | 7c35de4df1056a5a1fb4de042197b8f5b1033b61 (diff) | |
parent | 958b9f85f8d9d884045ed4b93b2082090e617f97 (diff) |
Merge branch 'misc.erofs' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git
Al Viro has a series of "->bd_inode elimination" which touches several
subsystems, but he also has EROFS-specific further cleanup patches
which I tend to go with EROFS tree for more testing.
Let's merge "#misc.erofs" as Al suggested in the previous email [1]:
"#misc.erofs (the first two commits) is put into never-rebased mode;
you pull it into your tree and do whatever's convenient with the rest.
I merge the same branch into block_device work; that way it doesn't
cause conflicts whatever else happens in our trees."
[1] https://lore.kernel.org/r/20240503041542.GV2118490@ZenIV
Signed-off-by: Gao Xiang <xiang@kernel.org>
Diffstat (limited to 'scripts/gdb/linux/tasks.py')
0 files changed, 0 insertions, 0 deletions