diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-07-30 11:44:00 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-07-30 11:44:00 -0700 |
commit | cf270e7b751478a0834acdc6068edc58fead82cd (patch) | |
tree | a3af1eba1f978964377257b517268cd0fb7b431e /lib | |
parent | b0b9850e7d53aec13ef12a485e5a301774d9132e (diff) | |
parent | f8ea95021022826a010f56cf19451c21f4c9c155 (diff) | |
download | linux-cf270e7b751478a0834acdc6068edc58fead82cd.tar.gz linux-cf270e7b751478a0834acdc6068edc58fead82cd.tar.bz2 linux-cf270e7b751478a0834acdc6068edc58fead82cd.zip |
Merge tag 'char-misc-6.5-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
Pull char driver and Documentation fixes from Greg KH:
"Here is a char driver fix and some documentation updates for 6.5-rc4
that contain the following changes:
- sram/genalloc bugfix for reported problem
- security-bugs.rst update based on recent discussions
- embargoed-hardware-issues minor cleanups and then partial revert
for the project/company lists
All of these have been in linux-next for a while with no reported
problems, and the documentation updates have all been reviewed by the
relevant developers"
* tag 'char-misc-6.5-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
misc/genalloc: Name subpools by of_node_full_name()
Documentation: embargoed-hardware-issues.rst: add AMD to the list
Documentation: embargoed-hardware-issues.rst: clean out empty and unused entries
Documentation: security-bugs.rst: clarify CVE handling
Documentation: security-bugs.rst: update preferences when dealing with the linux-distros group
Diffstat (limited to 'lib')
-rw-r--r-- | lib/genalloc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/genalloc.c b/lib/genalloc.c index 0c883d6fbd44..6c644f954bc5 100644 --- a/lib/genalloc.c +++ b/lib/genalloc.c @@ -895,7 +895,7 @@ struct gen_pool *of_gen_pool_get(struct device_node *np, of_property_read_string(np_pool, "label", &name); if (!name) - name = np_pool->name; + name = of_node_full_name(np_pool); } if (pdev) pool = gen_pool_get(&pdev->dev, name); |