Skip to content

[pull] master from torvalds:master#1504

Merged
pull[bot] merged 3 commits intoMatrix-N:masterfrom
torvalds:master
Jan 5, 2026
Merged

[pull] master from torvalds:master#1504
pull[bot] merged 3 commits intoMatrix-N:masterfrom
torvalds:master

Conversation

@pull
Copy link
Copy Markdown

@pull pull bot commented Jan 5, 2026

See Commits and Changes for more details.


Created by pull[bot] (v2.0.0-alpha.4)

Can you help keep this open source service alive? 💖 Please sponsor : )

Saravana Kannan and others added 3 commits December 29, 2025 14:32
I've switched employers. Updating email address to be employer-agnostic and
remain reachable. Also updating mailmap so all my previous emails map to
this new one.

Signed-off-by: Saravana Kannan <saravanak@kernel.org>
Link: https://patch.msgid.link/20251229060350.852-1-saravanak@kernel.org
Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
In unittest_data_add(), if of_resolve_phandles() fails, the allocated
unittest_data is not freed, leading to a memory leak.

Fix this by using scope-based cleanup helper __free(kfree) for automatic
resource cleanup. This ensures unittest_data is automatically freed when
it goes out of scope in error paths.

For the success path, use retain_and_null_ptr() to transfer ownership
of the memory to the device tree and prevent double freeing.

Fixes: 2eb46da ("of/selftest: Use the resolver to fixup phandles")
Suggested-by: Rob Herring <robh@kernel.org>
Co-developed-by: Jianhao Xu <jianhao.xu@seu.edu.cn>
Signed-off-by: Jianhao Xu <jianhao.xu@seu.edu.cn>
Signed-off-by: Zilin Guan <zilin@seu.edu.cn>
Link: https://patch.msgid.link/20251231114915.234638-1-zilin@seu.edu.cn
Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
…cm/linux/kernel/git/robh/linux

Pull devicetree fixes from Rob Herring:

 - Fix an error path memory leak in DT unittest

 - Update Saravana's bouncing email

* tag 'devicetree-fixes-for-6.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
  of: unittest: Fix memory leak in unittest_data_add()
  MAINTAINERS: Update Saravana Kannan's email address
@pull pull bot locked and limited conversation to collaborators Jan 5, 2026
@pull pull bot added the ⤵️ pull label Jan 5, 2026
@pull pull bot merged commit 3609fa9 into Matrix-N:master Jan 5, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants