Skip to contentSkip to conversation

core/debugobjects change for v5.9

GIT PULL Merged Ingo Molnar 2 participants 2 messages Aug 3, 2020

lore
Share & tools
lore
#0 lore raw

Linus,

Please pull the latest core/debugobjects git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git core-debugobjects-2020-08-03

# HEAD: 0f85c4805184765ff35e0079b3241ee8f25d1b2b debugobjects: Convert to DEFINE_SHOW_ATTRIBUTE

A single commit which simplifies a debugfs attribute definition.

Note that depending on merge window order, there might be a conflict with the following pending -next commit in the set_fs tree:

4d4901c6d748 ("seq_file: switch over direct seq_read method calls to seq_read_iter")

The correct resolution is I believe to discard the lib/debugobjects.c change from 4d4901c6d748, which got mooted by the cleanup in 0f85c480518.

Thanks,

Ingo

------------------>
Qinglang Miao (1):
debugobjects: Convert to DEFINE_SHOW_ATTRIBUTE

 lib/debugobjects.c | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)
merge bot Merged
#1 lore raw
The pull request you sent on Mon, 3 Aug 2020 13:09:44 +0200:

The pull request you sent on Mon, 3 Aug 2020 13:09:44 +0200:

Quoted 1 line

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git core-debugobjects-2020-08-03

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/c8e69391d046a6acaa6a4cf72f9952ecd77d3085

Thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker