All of lore.kernel.org
 help / color / mirror / Atom feed
* [GIT PULL] core/debugobjects change for v5.9
@ 2020-08-03 11:09 Ingo Molnar
  2020-08-03 22:10 ` pr-tracker-bot
  0 siblings, 1 reply; 2+ messages in thread
From: Ingo Molnar @ 2020-08-03 11:09 UTC (permalink / raw)
  To: Linus Torvalds
  Cc: linux-kernel, Thomas Gleixner, Peter Zijlstra, Andrew Morton

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(-)

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [GIT PULL] core/debugobjects change for v5.9
  2020-08-03 11:09 [GIT PULL] core/debugobjects change for v5.9 Ingo Molnar
@ 2020-08-03 22:10 ` pr-tracker-bot
  0 siblings, 0 replies; 2+ messages in thread
From: pr-tracker-bot @ 2020-08-03 22:10 UTC (permalink / raw)
  To: Ingo Molnar
  Cc: Linus Torvalds, linux-kernel, Thomas Gleixner, Peter Zijlstra,
	Andrew Morton

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

> 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!

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

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2020-08-03 22:10 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-08-03 11:09 [GIT PULL] core/debugobjects change for v5.9 Ingo Molnar
2020-08-03 22:10 ` pr-tracker-bot

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.