Merge tag 'devprop-5.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 30 Oct 2020 19:53:49 +0000 (12:53 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 30 Oct 2020 19:53:49 +0000 (12:53 -0700)
commita5a16050d78dd4a8a5a2a6614e64f76d59ef8a2e
tree891a6fe146cb004d8bb486be5fe4fbff49306fa4
parentee176906dc882ba6223d834ae61790e7550515fd
parent99aed9227073fb34ce2880cbc7063e04185a65e1
Merge tag 'devprop-5.10-rc2' of git://git./linux/kernel/git/rafael/linux-pm

Pull device properties framework fixes from Rafael Wysocki:
 "Fix the secondary firmware node handling while manipulating the
  primary firmware node for a given device (Andy Shevchenko)"

* tag 'devprop-5.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  device property: Don't clear secondary pointer for shared primary firmware node
  device property: Keep secondary firmware node secondary by type