diff options
| author | Dave Airlie <airlied@redhat.com> | 2023-06-19 15:59:52 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2023-06-19 16:01:25 +1000 |
| commit | cce3b573a52a41dd7face9dbf745f10f9bf4632b (patch) | |
| tree | 4540c11587221cfb90ac9cfb7916b2d2c17c6127 /tools/net/ynl/lib/ynl.py | |
| parent | bcbede6fbeb0e1eb85ccbb532faf06d3b31f0e73 (diff) | |
| parent | 45a3e24f65e90a047bef86f927ebdc4c710edaa1 (diff) | |
Backmerge tag 'v6.4-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into drm-next
Linux 6.4-rc7
Need this to pull in the msm work.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'tools/net/ynl/lib/ynl.py')
| -rw-r--r-- | tools/net/ynl/lib/ynl.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/net/ynl/lib/ynl.py b/tools/net/ynl/lib/ynl.py index aa77bcae4807..3144f33196be 100644 --- a/tools/net/ynl/lib/ynl.py +++ b/tools/net/ynl/lib/ynl.py @@ -591,8 +591,9 @@ class YnlFamily(SpecFamily): print('Unexpected message: ' + repr(gm)) continue - rsp.append(self._decode(gm.raw_attrs, op.attr_set.name) - | gm.fixed_header_attrs) + rsp_msg = self._decode(gm.raw_attrs, op.attr_set.name) + rsp_msg.update(gm.fixed_header_attrs) + rsp.append(rsp_msg) if not rsp: return None |