<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<!DOCTYPE bugzilla SYSTEM "https://bugs.webkit.org/page.cgi?id=bugzilla.dtd">

<bugzilla version="5.0.4.1"
          urlbase="https://bugs.webkit.org/"
          
          maintainer="admin@webkit.org"
>

    <bug>
          <bug_id>194326</bug_id>
          
          <creation_ts>2019-02-05 19:30:28 -0800</creation_ts>
          <short_desc>[GStreamer] Mock GStreamer realtime sources should keep a Ref of their mock realtime media sources</short_desc>
          <delta_ts>2019-07-12 17:12:07 -0700</delta_ts>
          <reporter_accessible>1</reporter_accessible>
          <cclist_accessible>1</cclist_accessible>
          <classification_id>1</classification_id>
          <classification>Unclassified</classification>
          <product>WebKit</product>
          <component>WebRTC</component>
          <version>WebKit Nightly Build</version>
          <rep_platform>Unspecified</rep_platform>
          <op_sys>Unspecified</op_sys>
          <bug_status>RESOLVED</bug_status>
          <resolution>FIXED</resolution>
          
          
          <bug_file_loc></bug_file_loc>
          <status_whiteboard></status_whiteboard>
          <keywords>InRadar</keywords>
          <priority>P2</priority>
          <bug_severity>Normal</bug_severity>
          <target_milestone>---</target_milestone>
          
          
          <everconfirmed>1</everconfirmed>
          <reporter name="youenn fablet">youennf</reporter>
          <assigned_to name="Thibault Saunier">tsaunier</assigned_to>
          <cc>commit-queue</cc>
    
    <cc>mcatanzaro</cc>
    
    <cc>pnormand</cc>
    
    <cc>tsaunier</cc>
    
    <cc>webkit-bug-importer</cc>
    
    <cc>youennf</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1502662</commentid>
    <comment_count>0</comment_count>
    <who name="youenn fablet">youennf</who>
    <bug_when>2019-02-05 19:30:28 -0800</bug_when>
    <thetext>Currently MockGStreamerAudioCaptureSource::m_wrappedSource is a std::unique_ptr&lt;RealtimeMediaSource&gt;.
Instead it should be a Ref&lt;RealtimeMediaSource&gt; as m_wrappedSource can be refed in some code but destroyed when MockGStreamerAudioCaptureSource is deleted even though being refed elsewhere.
Ditto for MockGStreamerVideoCaptureSource</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1502664</commentid>
    <comment_count>1</comment_count>
    <who name="Thibault Saunier">tsaunier</who>
    <bug_when>2019-02-05 19:33:40 -0800</bug_when>
    <thetext>How can it be reffed somewhere else? afair it is fully internal to the MockGStreamerAudioCaptureSource</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1502665</commentid>
    <comment_count>2</comment_count>
    <who name="youenn fablet">youennf</who>
    <bug_when>2019-02-05 19:39:26 -0800</bug_when>
    <thetext>(In reply to Thibault Saunier from comment #1)
&gt; How can it be reffed somewhere else? afair it is fully internal to the
&gt; MockGStreamerAudioCaptureSource

It might ref itself for instance, or the implementation might pass a &amp; to some other code that will keep a Ref&lt;&gt;.

Any class that is RefCounted&lt;&gt;/ThreadSafeRefCounted&lt;&gt; should be kept through Ref/RefPtr.
Constructors of such classes are often private/protected and a static create method is used instead.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1552029</commentid>
    <comment_count>3</comment_count>
      <attachid>373915</attachid>
    <who name="Thibault Saunier">tsaunier</who>
    <bug_when>2019-07-11 05:42:35 -0700</bug_when>
    <thetext>Created attachment 373915
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1552035</commentid>
    <comment_count>4</comment_count>
      <attachid>373915</attachid>
    <who name="Philippe Normand">pnormand</who>
    <bug_when>2019-07-11 06:07:14 -0700</bug_when>
    <thetext>Comment on attachment 373915
Patch

not needed for AudioCaptureSource?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1552037</commentid>
    <comment_count>5</comment_count>
      <attachid>373917</attachid>
    <who name="Thibault Saunier">tsaunier</who>
    <bug_when>2019-07-11 06:21:03 -0700</bug_when>
    <thetext>Created attachment 373917
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1552038</commentid>
    <comment_count>6</comment_count>
    <who name="Thibault Saunier">tsaunier</who>
    <bug_when>2019-07-11 06:21:17 -0700</bug_when>
    <thetext>(In reply to Philippe Normand from comment #4)
&gt; Comment on attachment 373915 [details]
&gt; Patch
&gt; 
&gt; not needed for AudioCaptureSource?

Fixed.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1552042</commentid>
    <comment_count>7</comment_count>
    <who name="Philippe Normand">pnormand</who>
    <bug_when>2019-07-11 06:35:51 -0700</bug_when>
    <thetext>WPE EWS doesn&apos;t like this :)</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1552045</commentid>
    <comment_count>8</comment_count>
      <attachid>373920</attachid>
    <who name="Thibault Saunier">tsaunier</who>
    <bug_when>2019-07-11 06:45:00 -0700</bug_when>
    <thetext>Created attachment 373920
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1552047</commentid>
    <comment_count>9</comment_count>
    <who name="Thibault Saunier">tsaunier</who>
    <bug_when>2019-07-11 06:45:34 -0700</bug_when>
    <thetext>(In reply to Philippe Normand from comment #7)
&gt; WPE EWS doesn&apos;t like this :)

Yeah, comited too fast, sorry about that. Should be better now :-)</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1552059</commentid>
    <comment_count>10</comment_count>
    <who name="Michael Catanzaro">mcatanzaro</who>
    <bug_when>2019-07-11 08:04:04 -0700</bug_when>
    <thetext>(In reply to youenn fablet from comment #2)
&gt; Constructors of such classes are often private/protected and a static create
&gt; method is used instead.

This is the important missing piece! You should fix this too.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1552068</commentid>
    <comment_count>11</comment_count>
    <who name="Thibault Saunier">tsaunier</who>
    <bug_when>2019-07-11 08:40:37 -0700</bug_when>
    <thetext>(In reply to Michael Catanzaro from comment #10)
&gt; (In reply to youenn fablet from comment #2)
&gt; &gt; Constructors of such classes are often private/protected and a static create
&gt; &gt; method is used instead.
&gt; 
&gt; This is the important missing piece! You should fix this too.

I do not think it is important in that case, the wrapping class is private and fully controlled by the GStreamer mock.

Adding it so it matches usual usage of that RefCounted classes.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1552070</commentid>
    <comment_count>12</comment_count>
      <attachid>373923</attachid>
    <who name="Thibault Saunier">tsaunier</who>
    <bug_when>2019-07-11 08:41:04 -0700</bug_when>
    <thetext>Created attachment 373923
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1552076</commentid>
    <comment_count>13</comment_count>
      <attachid>373923</attachid>
    <who name="youenn fablet">youennf</who>
    <bug_when>2019-07-11 09:22:15 -0700</bug_when>
    <thetext>Comment on attachment 373923
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=373923&amp;action=review

&gt; Source/WebCore/platform/mediastream/gstreamer/MockGStreamerAudioCaptureSource.cpp:134
&gt; +        , m_src(nullptr)

GRefPtr&lt;GstElement&gt; might do like RefPtr&lt;&gt;.
Is m_src(nullptr) needed?

&gt; Source/WebCore/platform/mediastream/gstreamer/MockGStreamerAudioCaptureSource.h:44
&gt; +    Ref&lt;RealtimeMediaSource&gt; m_wrappedSource;

Do you need m_wrappedSource to be a RealtimeMediaSource?
Can it be a WrappedMockRealtimeAudioSource so that you remove the above static_cast?

Can we separate methods from members declarations?

&gt; Source/WebCore/platform/mediastream/gstreamer/MockGStreamerVideoCaptureSource.h:46
&gt; +    Ref&lt;RealtimeMediaSource&gt; m_wrappedSource;

We usually separate methods from members.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1552089</commentid>
    <comment_count>14</comment_count>
      <attachid>373923</attachid>
    <who name="youenn fablet">youennf</who>
    <bug_when>2019-07-11 09:49:43 -0700</bug_when>
    <thetext>Comment on attachment 373923
Patch

I think the patch is good to go with the proposed style improvements.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1552110</commentid>
    <comment_count>15</comment_count>
    <who name="Thibault Saunier">tsaunier</who>
    <bug_when>2019-07-11 10:47:53 -0700</bug_when>
    <thetext>(In reply to youenn fablet from comment #13)
&gt; Comment on attachment 373923 [details]
&gt; Patch
&gt; &gt; Source/WebCore/platform/mediastream/gstreamer/MockGStreamerAudioCaptureSource.h:44
&gt; &gt; +    Ref&lt;RealtimeMediaSource&gt; m_wrappedSource;
&gt; 
&gt; Do you need m_wrappedSource to be a RealtimeMediaSource?
&gt; Can it be a WrappedMockRealtimeAudioSource so that you remove the above
&gt; static_cast?

Well, I would rather have the `WrappedMockRealtimeAudioSource` hidden in the C file than needing to have a declaration in the header.

--

Addressing the other comments.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1552126</commentid>
    <comment_count>16</comment_count>
    <who name="youenn fablet">youennf</who>
    <bug_when>2019-07-11 11:18:34 -0700</bug_when>
    <thetext>&gt; Well, I would rather have the `WrappedMockRealtimeAudioSource` hidden in the
&gt; C file than needing to have a declaration in the header.

You can probably forward declare WrappedMockRealtimeAudioSource in the header.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1552127</commentid>
    <comment_count>17</comment_count>
    <who name="Thibault Saunier">tsaunier</who>
    <bug_when>2019-07-11 11:26:03 -0700</bug_when>
    <thetext>(In reply to youenn fablet from comment #16)
&gt; &gt; Well, I would rather have the `WrappedMockRealtimeAudioSource` hidden in the
&gt; &gt; C file than needing to have a declaration in the header.
&gt; 
&gt; You can probably forward declare WrappedMockRealtimeAudioSource in the
&gt; header.

Just typdefing it doesn&apos;t cut it afaics as I need need to make protected methods public in the wrapper subclass, and that doesn&apos;t seem to work.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1552129</commentid>
    <comment_count>18</comment_count>
      <attachid>373932</attachid>
    <who name="Thibault Saunier">tsaunier</who>
    <bug_when>2019-07-11 11:30:22 -0700</bug_when>
    <thetext>Created attachment 373932
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1552131</commentid>
    <comment_count>19</comment_count>
    <who name="youenn fablet">youennf</who>
    <bug_when>2019-07-11 11:35:39 -0700</bug_when>
    <thetext>(In reply to Thibault Saunier from comment #17)
&gt; (In reply to youenn fablet from comment #16)
&gt; &gt; &gt; Well, I would rather have the `WrappedMockRealtimeAudioSource` hidden in the
&gt; &gt; &gt; C file than needing to have a declaration in the header.
&gt; &gt; 
&gt; &gt; You can probably forward declare WrappedMockRealtimeAudioSource in the
&gt; &gt; header.
&gt; 
&gt; Just typdefing it doesn&apos;t cut it afaics as I need need to make protected
&gt; methods public in the wrapper subclass, and that doesn&apos;t seem to work.

Unfortunate, I guess you could have a getter that returns a RealtimeMediaSource&amp;.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1552146</commentid>
    <comment_count>20</comment_count>
    <who name="Thibault Saunier">tsaunier</who>
    <bug_when>2019-07-11 12:14:48 -0700</bug_when>
    <thetext>(In reply to youenn fablet from comment #19)
&gt; (In reply to Thibault Saunier from comment #17)
&gt; &gt; (In reply to youenn fablet from comment #16)
&gt; &gt; &gt; &gt; Well, I would rather have the `WrappedMockRealtimeAudioSource` hidden in the
&gt; &gt; &gt; &gt; C file than needing to have a declaration in the header.
&gt; &gt; &gt; 
&gt; &gt; &gt; You can probably forward declare WrappedMockRealtimeAudioSource in the
&gt; &gt; &gt; header.
&gt; &gt; 
&gt; &gt; Just typdefing it doesn&apos;t cut it afaics as I need need to make protected
&gt; &gt; methods public in the wrapper subclass, and that doesn&apos;t seem to work.
&gt; 
&gt; Unfortunate, I guess you could have a getter that returns a
&gt; RealtimeMediaSource&amp;.

That would work, why do you think it is better than static_cast&apos;ing though?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1552204</commentid>
    <comment_count>21</comment_count>
    <who name="youenn fablet">youennf</who>
    <bug_when>2019-07-11 14:10:57 -0700</bug_when>
    <thetext>&gt; That would work, why do you think it is better than static_cast&apos;ing though?

Upcasting is safe and conceptually it seems better since you need the member to be of a more precise type.
In this particular case, it is one downcasting and it probably does not create a big risk so it is probably fine either way.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1552205</commentid>
    <comment_count>22</comment_count>
      <attachid>373932</attachid>
    <who name="youenn fablet">youennf</who>
    <bug_when>2019-07-11 14:12:45 -0700</bug_when>
    <thetext>Comment on attachment 373932
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=373932&amp;action=review

&gt; Source/WebCore/platform/mediastream/gstreamer/MockGStreamerAudioCaptureSource.h:43
&gt;      void videoSampleAvailable(MediaSample&amp;) override { };

Should probably be final as well.

&gt; Source/WebCore/platform/mediastream/gstreamer/MockGStreamerVideoCaptureSource.h:48
&gt;      void videoSampleAvailable(MediaSample&amp;) override;

Ditto.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1552246</commentid>
    <comment_count>23</comment_count>
      <attachid>373963</attachid>
    <who name="Thibault Saunier">tsaunier</who>
    <bug_when>2019-07-11 15:09:36 -0700</bug_when>
    <thetext>Created attachment 373963
Patch for landing</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1552247</commentid>
    <comment_count>24</comment_count>
    <who name="Thibault Saunier">tsaunier</who>
    <bug_when>2019-07-11 15:12:46 -0700</bug_when>
    <thetext>(In reply to youenn fablet from comment #22)
&gt; Comment on attachment 373932 [details]
&gt; Patch
&gt; 
&gt; View in context:
&gt; https://bugs.webkit.org/attachment.cgi?id=373932&amp;action=review
&gt; 
&gt; &gt; Source/WebCore/platform/mediastream/gstreamer/MockGStreamerAudioCaptureSource.h:43
&gt; &gt;      void videoSampleAvailable(MediaSample&amp;) override { };
&gt; 
&gt; Should probably be final as well.
Done

&gt; &gt; Source/WebCore/platform/mediastream/gstreamer/MockGStreamerVideoCaptureSource.h:48
&gt; &gt;      void videoSampleAvailable(MediaSample&amp;) override;
&gt; 
&gt; Ditto.

Done, also for the audio case.

(In reply to youenn fablet from comment #21)
&gt; &gt; That would work, why do you think it is better than static_cast&apos;ing though?
&gt; 
&gt; Upcasting is safe and conceptually it seems better since you need the member
&gt; to be of a more precise type.
&gt; In this particular case, it is one downcasting and it probably does not
&gt; create a big risk so it is probably fine either way.

I ended up doing what you suggested, not sure it is much better for that particular case, but I agree it is better to upcast than to downcast in any case.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1552253</commentid>
    <comment_count>25</comment_count>
      <attachid>373963</attachid>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2019-07-11 15:27:22 -0700</bug_when>
    <thetext>Comment on attachment 373963
Patch for landing

Rejecting attachment 373963 from commit-queue.

Failed to run &quot;[&apos;/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch&apos;, &apos;--status-host=webkit-queues.webkit.org&apos;, &apos;--bot-id=webkit-cq-03&apos;, &apos;validate-changelog&apos;, &apos;--check-oops&apos;, &apos;--non-interactive&apos;, 373963, &apos;--port=mac&apos;]&quot; exit_code: 1 cwd: /Volumes/Data/EWS/WebKit

ChangeLog entry in Source/WebCore/ChangeLog contains OOPS!.

Full output: https://webkit-queues.webkit.org/results/12718981</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1552256</commentid>
    <comment_count>26</comment_count>
      <attachid>373966</attachid>
    <who name="Thibault Saunier">tsaunier</who>
    <bug_when>2019-07-11 15:33:33 -0700</bug_when>
    <thetext>Created attachment 373966
Patch for landing</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1552383</commentid>
    <comment_count>27</comment_count>
    <who name="Philippe Normand">pnormand</who>
    <bug_when>2019-07-12 02:08:59 -0700</bug_when>
    <thetext>Now the cq seems stuck in an infinite loop. :)</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1552403</commentid>
    <comment_count>28</comment_count>
      <attachid>374007</attachid>
    <who name="Thibault Saunier">tsaunier</who>
    <bug_when>2019-07-12 06:27:18 -0700</bug_when>
    <thetext>Created attachment 374007
Patch for landing</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1552616</commentid>
    <comment_count>29</comment_count>
      <attachid>374007</attachid>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2019-07-12 17:05:24 -0700</bug_when>
    <thetext>Comment on attachment 374007
Patch for landing

Clearing flags on attachment: 374007

Committed r247407: &lt;https://trac.webkit.org/changeset/247407&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1552617</commentid>
    <comment_count>30</comment_count>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2019-07-12 17:05:26 -0700</bug_when>
    <thetext>All reviewed patches have been landed.  Closing bug.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1552620</commentid>
    <comment_count>31</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2019-07-12 17:12:07 -0700</bug_when>
    <thetext>&lt;rdar://problem/53034643&gt;</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>373915</attachid>
            <date>2019-07-11 05:42:35 -0700</date>
            <delta_ts>2019-07-11 06:21:00 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-194326-20190711084234.patch</filename>
            <type>text/plain</type>
            <size>2948</size>
            <attacher name="Thibault Saunier">tsaunier</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ3Mjk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjIxNDdiZjc1ZmVhNDU5
ZWNmY2FmZmQ2NDJjNjhhMzUyMmUxZTEyZC4uZDNhNWViMjY3YzlmMDNhOWUxODE5MjA0OTEwMjUw
YzUxNjc0NzJhNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDE5LTA3LTExICBUaGli
YXVsdCBTYXVuaWVyICA8dHNhdW5pZXJAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1N0cmVhbWVy
XSBNb2NrIEdTdHJlYW1lciByZWFsdGltZSBzb3VyY2VzIHNob3VsZCBrZWVwIGEgUmVmIG9mIHRo
ZWlyIG1vY2sgcmVhbHRpbWUgbWVkaWEgc291cmNlcworICAgICAgICBodHRwczovL2J1Z3Mud2Vi
a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk0MzI2CisKKyAgICAgICAgV3JhcHBlZE1vY2tSZWFs
dGltZVZpZGVvU291cmNlIGlzIGEgc3ViY2xhc3Mgb2YgUmVhbHRpbWVNZWRpYVNvdXJjZSB3aGlj
aCBpcyByZWZjb3VudGVkLCB3ZSBjYW4ndAorICAgICAgICB1c2UgYSB1bmlxdWVfcHRyIG9uIHRo
b3NlLgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRo
aXMgZml4ZXMgTWVkaWFTdHJlYW0gdGVzdHMKKworICAgICAgICAqIHBsYXRmb3JtL21lZGlhc3Ry
ZWFtL2dzdHJlYW1lci9Nb2NrR1N0cmVhbWVyVmlkZW9DYXB0dXJlU291cmNlLmNwcDoKKyAgICAg
ICAgKFdlYkNvcmU6Om1fd3JhcHBlZFNvdXJjZSk6CisgICAgICAgICogcGxhdGZvcm0vbWVkaWFz
dHJlYW0vZ3N0cmVhbWVyL01vY2tHU3RyZWFtZXJWaWRlb0NhcHR1cmVTb3VyY2UuaDoKKwogMjAx
OS0wNy0xMCAgVGhpYmF1bHQgU2F1bmllciAgPHRzYXVuaWVyQGlnYWxpYS5jb20+CiAKICAgICAg
ICAgW0dTdHJlYW1lcl1bTWVkaWFTdHJlYW1dIFVzZSB0aGUgbmV3IGRpc3BhdGNoTWVkaWFTYW1w
bGVUb09ic2VydmVycyB0byBkaXNwYXRjaCBuZXcgYnVmZmVycwpkaWZmIC0tZ2l0IGEvU291cmNl
L1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vZ3N0cmVhbWVyL01vY2tHU3RyZWFtZXJWaWRl
b0NhcHR1cmVTb3VyY2UuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0v
Z3N0cmVhbWVyL01vY2tHU3RyZWFtZXJWaWRlb0NhcHR1cmVTb3VyY2UuY3BwCmluZGV4IDJjNzJm
NWI4Nzg2N2ZhMWRkZGRiNzE3NTM3MGIyNzNlY2I0YWI0NDYuLmRlOTZhNzVkOGY2ZTU2Y2ZkMDQ3
ODU2ZGYwNTY3ODI3NTdjZThjMzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt
L21lZGlhc3RyZWFtL2dzdHJlYW1lci9Nb2NrR1N0cmVhbWVyVmlkZW9DYXB0dXJlU291cmNlLmNw
cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9nc3RyZWFtZXIvTW9j
a0dTdHJlYW1lclZpZGVvQ2FwdHVyZVNvdXJjZS5jcHAKQEAgLTk3LDcgKzk3LDcgQEAgdm9pZCBN
b2NrR1N0cmVhbWVyVmlkZW9DYXB0dXJlU291cmNlOjp2aWRlb1NhbXBsZUF2YWlsYWJsZShNZWRp
YVNhbXBsZSYgc2FtcGxlKQogCiBNb2NrR1N0cmVhbWVyVmlkZW9DYXB0dXJlU291cmNlOjpNb2Nr
R1N0cmVhbWVyVmlkZW9DYXB0dXJlU291cmNlKFN0cmluZyYmIGRldmljZUlELCBTdHJpbmcmJiBu
YW1lLCBTdHJpbmcmJiBoYXNoU2FsdCkKICAgICA6IEdTdHJlYW1lclZpZGVvQ2FwdHVyZVNvdXJj
ZShTdHJpbmcgeyBkZXZpY2VJRCB9LCBTdHJpbmcgeyBuYW1lIH0sIFN0cmluZyB7IGhhc2hTYWx0
IH0sICJhcHBzcmMiKQotICAgICwgbV93cmFwcGVkU291cmNlKHN0ZDo6bWFrZV91bmlxdWU8V3Jh
cHBlZE1vY2tSZWFsdGltZVZpZGVvU291cmNlPihXVEZNb3ZlKGRldmljZUlEKSwgV1RGTW92ZShu
YW1lKSwgV1RGTW92ZShoYXNoU2FsdCkpKQorICAgICwgbV93cmFwcGVkU291cmNlKGFkb3B0UmVm
KCpuZXcgV3JhcHBlZE1vY2tSZWFsdGltZVZpZGVvU291cmNlKFdURk1vdmUoZGV2aWNlSUQpLCBX
VEZNb3ZlKG5hbWUpLCBXVEZNb3ZlKGhhc2hTYWx0KSkpKQogewogICAgIG1fd3JhcHBlZFNvdXJj
ZS0+YWRkT2JzZXJ2ZXIoKnRoaXMpOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxh
dGZvcm0vbWVkaWFzdHJlYW0vZ3N0cmVhbWVyL01vY2tHU3RyZWFtZXJWaWRlb0NhcHR1cmVTb3Vy
Y2UuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL2dzdHJlYW1lci9Nb2Nr
R1N0cmVhbWVyVmlkZW9DYXB0dXJlU291cmNlLmgKaW5kZXggODk3YTMxYzZmOGI3OTJjOTI0NWY5
MTZiZTdmZWM2NzcxMDNiY2EyNS4uNTNlYzk0NmJmMWQwZjg1ZTQxYTM4MmZlY2FkZTA4MmI2ZjA2
MzBiYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vZ3N0
cmVhbWVyL01vY2tHU3RyZWFtZXJWaWRlb0NhcHR1cmVTb3VyY2UuaAorKysgYi9Tb3VyY2UvV2Vi
Q29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9nc3RyZWFtZXIvTW9ja0dTdHJlYW1lclZpZGVvQ2Fw
dHVyZVNvdXJjZS5oCkBAIC00Myw3ICs0Myw3IEBAIHByaXZhdGU6CiAgICAgdm9pZCBzdG9wUHJv
ZHVjaW5nRGF0YSgpIGZpbmFsOwogICAgIHZvaWQgc3RhcnRQcm9kdWNpbmdEYXRhKCkgZmluYWw7
CiAgICAgY29uc3QgUmVhbHRpbWVNZWRpYVNvdXJjZVNldHRpbmdzJiBzZXR0aW5ncygpIGZpbmFs
OwotICAgIHN0ZDo6dW5pcXVlX3B0cjxSZWFsdGltZU1lZGlhU291cmNlPiBtX3dyYXBwZWRTb3Vy
Y2U7CisgICAgUmVmPFJlYWx0aW1lTWVkaWFTb3VyY2U+IG1fd3JhcHBlZFNvdXJjZTsKICAgICBj
b25zdCBSZWFsdGltZU1lZGlhU291cmNlQ2FwYWJpbGl0aWVzJiBjYXBhYmlsaXRpZXMoKSBmaW5h
bDsKICAgICB2b2lkIGNhcHR1cmVGYWlsZWQoKSBvdmVycmlkZTsKIAo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>373917</attachid>
            <date>2019-07-11 06:21:03 -0700</date>
            <delta_ts>2019-07-11 06:44:56 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-194326-20190711092102.patch</filename>
            <type>text/plain</type>
            <size>4941</size>
            <attacher name="Thibault Saunier">tsaunier</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ3MzQ3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWUyZTlhOWI4OWIwZjY1
OWE1NDNiZTE5NDBjOTQwZTFhOWJkODE1ZC4uYmQ3YTFiNWFiOTlhMDI4YzM0ZjgzMzE3MzIzNWY4
MDVlMjRmMTVhZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDE5LTA3LTExICBUaGli
YXVsdCBTYXVuaWVyICA8dHNhdW5pZXJAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1N0cmVhbWVy
XSBNb2NrIEdTdHJlYW1lciByZWFsdGltZSBzb3VyY2VzIHNob3VsZCBrZWVwIGEgUmVmIG9mIHRo
ZWlyIG1vY2sgcmVhbHRpbWUgbWVkaWEgc291cmNlcworICAgICAgICBodHRwczovL2J1Z3Mud2Vi
a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk0MzI2CisKKyAgICAgICAgV3JhcHBlZE1vY2tSZWFs
dGltZVZpZGVvU291cmNlIGlzIGEgc3ViY2xhc3Mgb2YgUmVhbHRpbWVNZWRpYVNvdXJjZSB3aGlj
aCBpcyByZWZjb3VudGVkLCB3ZSBjYW4ndAorICAgICAgICB1c2UgYSB1bmlxdWVfcHRyIG9uIHRo
b3NlLgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRo
aXMgZml4ZXMgTWVkaWFTdHJlYW0gdGVzdHMKKworICAgICAgICAqIHBsYXRmb3JtL21lZGlhc3Ry
ZWFtL2dzdHJlYW1lci9Nb2NrR1N0cmVhbWVyQXVkaW9DYXB0dXJlU291cmNlLmNwcDoKKyAgICAg
ICAgKFdlYkNvcmU6Om1fd3JhcHBlZFNvdXJjZSk6CisgICAgICAgICogcGxhdGZvcm0vbWVkaWFz
dHJlYW0vZ3N0cmVhbWVyL01vY2tHU3RyZWFtZXJBdWRpb0NhcHR1cmVTb3VyY2UuaDoKKyAgICAg
ICAgKiBwbGF0Zm9ybS9tZWRpYXN0cmVhbS9nc3RyZWFtZXIvTW9ja0dTdHJlYW1lclZpZGVvQ2Fw
dHVyZVNvdXJjZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjptX3dyYXBwZWRTb3VyY2UpOgorICAg
ICAgICAqIHBsYXRmb3JtL21lZGlhc3RyZWFtL2dzdHJlYW1lci9Nb2NrR1N0cmVhbWVyVmlkZW9D
YXB0dXJlU291cmNlLmg6CisKIDIwMTktMDctMTEgIFRoaWJhdWx0IFNhdW5pZXIgIDx0c2F1bmll
ckBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtHU3RyZWFtZXJdW01lZGlhU3RyZWFtXSBVc2UgdGhl
IG5ldyBkaXNwYXRjaE1lZGlhU2FtcGxlVG9PYnNlcnZlcnMgdG8gZGlzcGF0Y2ggbmV3IGJ1ZmZl
cnMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL2dzdHJl
YW1lci9Nb2NrR1N0cmVhbWVyQXVkaW9DYXB0dXJlU291cmNlLmNwcCBiL1NvdXJjZS9XZWJDb3Jl
L3BsYXRmb3JtL21lZGlhc3RyZWFtL2dzdHJlYW1lci9Nb2NrR1N0cmVhbWVyQXVkaW9DYXB0dXJl
U291cmNlLmNwcAppbmRleCAwZjFmNzM5YjBjZjZmZTBhODFlMDUwNmNlNTg3OTNjZGE0NTU2ZDMy
Li4zNGVkYTYzZGE1ZmE1OGM4NzUzNzcwMTU5MzM0NmM5NmNjZmNmOTc1IDEwMDY0NAotLS0gYS9T
b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9nc3RyZWFtZXIvTW9ja0dTdHJlYW1l
ckF1ZGlvQ2FwdHVyZVNvdXJjZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVk
aWFzdHJlYW0vZ3N0cmVhbWVyL01vY2tHU3RyZWFtZXJBdWRpb0NhcHR1cmVTb3VyY2UuY3BwCkBA
IC0xNTQsNyArMTU0LDcgQEAgdm9pZCBNb2NrR1N0cmVhbWVyQXVkaW9DYXB0dXJlU291cmNlOjph
cHBseUNvbnN0cmFpbnRzKGNvbnN0IE1lZGlhQ29uc3RyYWludHMmIGMKIAogTW9ja0dTdHJlYW1l
ckF1ZGlvQ2FwdHVyZVNvdXJjZTo6TW9ja0dTdHJlYW1lckF1ZGlvQ2FwdHVyZVNvdXJjZShTdHJp
bmcmJiBkZXZpY2VJRCwgU3RyaW5nJiYgbmFtZSwgU3RyaW5nJiYgaGFzaFNhbHQpCiAgICAgOiBH
U3RyZWFtZXJBdWRpb0NhcHR1cmVTb3VyY2UoU3RyaW5nIHsgZGV2aWNlSUQgfSwgU3RyaW5nIHsg
bmFtZSB9LCBTdHJpbmcgeyBoYXNoU2FsdCB9KQotICAgICwgbV93cmFwcGVkU291cmNlKHN0ZDo6
bWFrZV91bmlxdWU8V3JhcHBlZE1vY2tSZWFsdGltZUF1ZGlvU291cmNlPihXVEZNb3ZlKGRldmlj
ZUlEKSwgV1RGTW92ZShuYW1lKSwgV1RGTW92ZShoYXNoU2FsdCkpKQorICAgICwgbV93cmFwcGVk
U291cmNlKGFkb3B0UmVmKCpuZXcgV3JhcHBlZE1vY2tSZWFsdGltZUF1ZGlvU291cmNlPihXVEZN
b3ZlKGRldmljZUlEKSwgV1RGTW92ZShuYW1lKSwgV1RGTW92ZShoYXNoU2FsdCkpKQogewogICAg
IG1fd3JhcHBlZFNvdXJjZS0+YWRkT2JzZXJ2ZXIoKnRoaXMpOwogfQpkaWZmIC0tZ2l0IGEvU291
cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vZ3N0cmVhbWVyL01vY2tHU3RyZWFtZXJB
dWRpb0NhcHR1cmVTb3VyY2UuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFt
L2dzdHJlYW1lci9Nb2NrR1N0cmVhbWVyQXVkaW9DYXB0dXJlU291cmNlLmgKaW5kZXggYmQ5OTlm
OWZhNjdmYmQ0ZjNiYTMzNzdjMDFiYThhMTFiNjcxNDM5OS4uNWQ5NGFiMTMxZmRiY2VjNjIxNzI3
NDU5MzUzOGVlYWM1Y2IxZDY5NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v
bWVkaWFzdHJlYW0vZ3N0cmVhbWVyL01vY2tHU3RyZWFtZXJBdWRpb0NhcHR1cmVTb3VyY2UuaAor
KysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9nc3RyZWFtZXIvTW9ja0dT
dHJlYW1lckF1ZGlvQ2FwdHVyZVNvdXJjZS5oCkBAIC00MSw3ICs0MSw3IEBAIHByaXZhdGU6CiAg
ICAgY29uc3QgUmVhbHRpbWVNZWRpYVNvdXJjZUNhcGFiaWxpdGllcyYgY2FwYWJpbGl0aWVzKCkg
ZmluYWw7CiAKICAgICB2b2lkIGNhcHR1cmVGYWlsZWQoKTsKLSAgICBzdGQ6OnVuaXF1ZV9wdHI8
UmVhbHRpbWVNZWRpYVNvdXJjZT4gbV93cmFwcGVkU291cmNlOworICAgIFJlZjxSZWFsdGltZU1l
ZGlhU291cmNlPiBtX3dyYXBwZWRTb3VyY2U7CiAKICAgICB2b2lkIHZpZGVvU2FtcGxlQXZhaWxh
YmxlKE1lZGlhU2FtcGxlJikgb3ZlcnJpZGUgeyB9OwogfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X
ZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL2dzdHJlYW1lci9Nb2NrR1N0cmVhbWVyVmlkZW9D
YXB0dXJlU291cmNlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL2dz
dHJlYW1lci9Nb2NrR1N0cmVhbWVyVmlkZW9DYXB0dXJlU291cmNlLmNwcAppbmRleCAyYzcyZjVi
ODc4NjdmYTFkZGRkYjcxNzUzNzBiMjczZWNiNGFiNDQ2Li5kZTk2YTc1ZDhmNmU1NmNmZDA0Nzg1
NmRmMDU2NzgyNzU3Y2U4YzMwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9t
ZWRpYXN0cmVhbS9nc3RyZWFtZXIvTW9ja0dTdHJlYW1lclZpZGVvQ2FwdHVyZVNvdXJjZS5jcHAK
KysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vZ3N0cmVhbWVyL01vY2tH
U3RyZWFtZXJWaWRlb0NhcHR1cmVTb3VyY2UuY3BwCkBAIC05Nyw3ICs5Nyw3IEBAIHZvaWQgTW9j
a0dTdHJlYW1lclZpZGVvQ2FwdHVyZVNvdXJjZTo6dmlkZW9TYW1wbGVBdmFpbGFibGUoTWVkaWFT
YW1wbGUmIHNhbXBsZSkKIAogTW9ja0dTdHJlYW1lclZpZGVvQ2FwdHVyZVNvdXJjZTo6TW9ja0dT
dHJlYW1lclZpZGVvQ2FwdHVyZVNvdXJjZShTdHJpbmcmJiBkZXZpY2VJRCwgU3RyaW5nJiYgbmFt
ZSwgU3RyaW5nJiYgaGFzaFNhbHQpCiAgICAgOiBHU3RyZWFtZXJWaWRlb0NhcHR1cmVTb3VyY2Uo
U3RyaW5nIHsgZGV2aWNlSUQgfSwgU3RyaW5nIHsgbmFtZSB9LCBTdHJpbmcgeyBoYXNoU2FsdCB9
LCAiYXBwc3JjIikKLSAgICAsIG1fd3JhcHBlZFNvdXJjZShzdGQ6Om1ha2VfdW5pcXVlPFdyYXBw
ZWRNb2NrUmVhbHRpbWVWaWRlb1NvdXJjZT4oV1RGTW92ZShkZXZpY2VJRCksIFdURk1vdmUobmFt
ZSksIFdURk1vdmUoaGFzaFNhbHQpKSkKKyAgICAsIG1fd3JhcHBlZFNvdXJjZShhZG9wdFJlZigq
bmV3IFdyYXBwZWRNb2NrUmVhbHRpbWVWaWRlb1NvdXJjZShXVEZNb3ZlKGRldmljZUlEKSwgV1RG
TW92ZShuYW1lKSwgV1RGTW92ZShoYXNoU2FsdCkpKSkKIHsKICAgICBtX3dyYXBwZWRTb3VyY2Ut
PmFkZE9ic2VydmVyKCp0aGlzKTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm
b3JtL21lZGlhc3RyZWFtL2dzdHJlYW1lci9Nb2NrR1N0cmVhbWVyVmlkZW9DYXB0dXJlU291cmNl
LmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9nc3RyZWFtZXIvTW9ja0dT
dHJlYW1lclZpZGVvQ2FwdHVyZVNvdXJjZS5oCmluZGV4IDg5N2EzMWM2ZjhiNzkyYzkyNDVmOTE2
YmU3ZmVjNjc3MTAzYmNhMjUuLjUzZWM5NDZiZjFkMGY4NWU0MWEzODJmZWNhZGUwODJiNmYwNjMw
YmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL2dzdHJl
YW1lci9Nb2NrR1N0cmVhbWVyVmlkZW9DYXB0dXJlU291cmNlLmgKKysrIGIvU291cmNlL1dlYkNv
cmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vZ3N0cmVhbWVyL01vY2tHU3RyZWFtZXJWaWRlb0NhcHR1
cmVTb3VyY2UuaApAQCAtNDMsNyArNDMsNyBAQCBwcml2YXRlOgogICAgIHZvaWQgc3RvcFByb2R1
Y2luZ0RhdGEoKSBmaW5hbDsKICAgICB2b2lkIHN0YXJ0UHJvZHVjaW5nRGF0YSgpIGZpbmFsOwog
ICAgIGNvbnN0IFJlYWx0aW1lTWVkaWFTb3VyY2VTZXR0aW5ncyYgc2V0dGluZ3MoKSBmaW5hbDsK
LSAgICBzdGQ6OnVuaXF1ZV9wdHI8UmVhbHRpbWVNZWRpYVNvdXJjZT4gbV93cmFwcGVkU291cmNl
OworICAgIFJlZjxSZWFsdGltZU1lZGlhU291cmNlPiBtX3dyYXBwZWRTb3VyY2U7CiAgICAgY29u
c3QgUmVhbHRpbWVNZWRpYVNvdXJjZUNhcGFiaWxpdGllcyYgY2FwYWJpbGl0aWVzKCkgZmluYWw7
CiAgICAgdm9pZCBjYXB0dXJlRmFpbGVkKCkgb3ZlcnJpZGU7CiAK
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>373920</attachid>
            <date>2019-07-11 06:45:00 -0700</date>
            <delta_ts>2019-07-11 08:41:00 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-194326-20190711094458.patch</filename>
            <type>text/plain</type>
            <size>5428</size>
            <attacher name="Thibault Saunier">tsaunier</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ3MzQ3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWUyZTlhOWI4OWIwZjY1
OWE1NDNiZTE5NDBjOTQwZTFhOWJkODE1ZC4uYmQ3YTFiNWFiOTlhMDI4YzM0ZjgzMzE3MzIzNWY4
MDVlMjRmMTVhZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDE5LTA3LTExICBUaGli
YXVsdCBTYXVuaWVyICA8dHNhdW5pZXJAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1N0cmVhbWVy
XSBNb2NrIEdTdHJlYW1lciByZWFsdGltZSBzb3VyY2VzIHNob3VsZCBrZWVwIGEgUmVmIG9mIHRo
ZWlyIG1vY2sgcmVhbHRpbWUgbWVkaWEgc291cmNlcworICAgICAgICBodHRwczovL2J1Z3Mud2Vi
a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk0MzI2CisKKyAgICAgICAgV3JhcHBlZE1vY2tSZWFs
dGltZVZpZGVvU291cmNlIGlzIGEgc3ViY2xhc3Mgb2YgUmVhbHRpbWVNZWRpYVNvdXJjZSB3aGlj
aCBpcyByZWZjb3VudGVkLCB3ZSBjYW4ndAorICAgICAgICB1c2UgYSB1bmlxdWVfcHRyIG9uIHRo
b3NlLgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRo
aXMgZml4ZXMgTWVkaWFTdHJlYW0gdGVzdHMKKworICAgICAgICAqIHBsYXRmb3JtL21lZGlhc3Ry
ZWFtL2dzdHJlYW1lci9Nb2NrR1N0cmVhbWVyQXVkaW9DYXB0dXJlU291cmNlLmNwcDoKKyAgICAg
ICAgKFdlYkNvcmU6Om1fd3JhcHBlZFNvdXJjZSk6CisgICAgICAgICogcGxhdGZvcm0vbWVkaWFz
dHJlYW0vZ3N0cmVhbWVyL01vY2tHU3RyZWFtZXJBdWRpb0NhcHR1cmVTb3VyY2UuaDoKKyAgICAg
ICAgKiBwbGF0Zm9ybS9tZWRpYXN0cmVhbS9nc3RyZWFtZXIvTW9ja0dTdHJlYW1lclZpZGVvQ2Fw
dHVyZVNvdXJjZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjptX3dyYXBwZWRTb3VyY2UpOgorICAg
ICAgICAqIHBsYXRmb3JtL21lZGlhc3RyZWFtL2dzdHJlYW1lci9Nb2NrR1N0cmVhbWVyVmlkZW9D
YXB0dXJlU291cmNlLmg6CisKIDIwMTktMDctMTEgIFRoaWJhdWx0IFNhdW5pZXIgIDx0c2F1bmll
ckBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtHU3RyZWFtZXJdW01lZGlhU3RyZWFtXSBVc2UgdGhl
IG5ldyBkaXNwYXRjaE1lZGlhU2FtcGxlVG9PYnNlcnZlcnMgdG8gZGlzcGF0Y2ggbmV3IGJ1ZmZl
cnMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL2dzdHJl
YW1lci9Nb2NrR1N0cmVhbWVyQXVkaW9DYXB0dXJlU291cmNlLmNwcCBiL1NvdXJjZS9XZWJDb3Jl
L3BsYXRmb3JtL21lZGlhc3RyZWFtL2dzdHJlYW1lci9Nb2NrR1N0cmVhbWVyQXVkaW9DYXB0dXJl
U291cmNlLmNwcAppbmRleCAwZjFmNzM5YjBjZjZmZTBhODFlMDUwNmNlNTg3OTNjZGE0NTU2ZDMy
Li41Y2QwZTg2NGI4MTJhZWRjNTgzNzg3OTkxMGM1NmNmYzM3YjliMTIyIDEwMDY0NAotLS0gYS9T
b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9nc3RyZWFtZXIvTW9ja0dTdHJlYW1l
ckF1ZGlvQ2FwdHVyZVNvdXJjZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVk
aWFzdHJlYW0vZ3N0cmVhbWVyL01vY2tHU3RyZWFtZXJBdWRpb0NhcHR1cmVTb3VyY2UuY3BwCkBA
IC0xNTQsNyArMTU0LDcgQEAgdm9pZCBNb2NrR1N0cmVhbWVyQXVkaW9DYXB0dXJlU291cmNlOjph
cHBseUNvbnN0cmFpbnRzKGNvbnN0IE1lZGlhQ29uc3RyYWludHMmIGMKIAogTW9ja0dTdHJlYW1l
ckF1ZGlvQ2FwdHVyZVNvdXJjZTo6TW9ja0dTdHJlYW1lckF1ZGlvQ2FwdHVyZVNvdXJjZShTdHJp
bmcmJiBkZXZpY2VJRCwgU3RyaW5nJiYgbmFtZSwgU3RyaW5nJiYgaGFzaFNhbHQpCiAgICAgOiBH
U3RyZWFtZXJBdWRpb0NhcHR1cmVTb3VyY2UoU3RyaW5nIHsgZGV2aWNlSUQgfSwgU3RyaW5nIHsg
bmFtZSB9LCBTdHJpbmcgeyBoYXNoU2FsdCB9KQotICAgICwgbV93cmFwcGVkU291cmNlKHN0ZDo6
bWFrZV91bmlxdWU8V3JhcHBlZE1vY2tSZWFsdGltZUF1ZGlvU291cmNlPihXVEZNb3ZlKGRldmlj
ZUlEKSwgV1RGTW92ZShuYW1lKSwgV1RGTW92ZShoYXNoU2FsdCkpKQorICAgICwgbV93cmFwcGVk
U291cmNlKGFkb3B0UmVmKCpuZXcgV3JhcHBlZE1vY2tSZWFsdGltZUF1ZGlvU291cmNlKFdURk1v
dmUoZGV2aWNlSUQpLCBXVEZNb3ZlKG5hbWUpLCBXVEZNb3ZlKGhhc2hTYWx0KSkpKQogewogICAg
IG1fd3JhcHBlZFNvdXJjZS0+YWRkT2JzZXJ2ZXIoKnRoaXMpOwogfQpAQCAtMTc0LDcgKzE3NCw3
IEBAIHZvaWQgTW9ja0dTdHJlYW1lckF1ZGlvQ2FwdHVyZVNvdXJjZTo6c3RvcFByb2R1Y2luZ0Rh
dGEoKQogdm9pZCBNb2NrR1N0cmVhbWVyQXVkaW9DYXB0dXJlU291cmNlOjpzdGFydFByb2R1Y2lu
Z0RhdGEoKQogewogICAgIEdTdHJlYW1lckF1ZGlvQ2FwdHVyZVNvdXJjZTo6c3RhcnRQcm9kdWNp
bmdEYXRhKCk7Ci0gICAgc3RhdGljX2Nhc3Q8V3JhcHBlZE1vY2tSZWFsdGltZUF1ZGlvU291cmNl
Kj4obV93cmFwcGVkU291cmNlLmdldCgpKS0+c3RhcnQoY2FwdHVyZXIoKS0+c291cmNlKCkpOwor
ICAgIHN0YXRpY19jYXN0PFdyYXBwZWRNb2NrUmVhbHRpbWVBdWRpb1NvdXJjZSY+KG1fd3JhcHBl
ZFNvdXJjZS5nZXQoKSkuc3RhcnQoY2FwdHVyZXIoKS0+c291cmNlKCkpOwogfQogCiBjb25zdCBS
ZWFsdGltZU1lZGlhU291cmNlU2V0dGluZ3MmIE1vY2tHU3RyZWFtZXJBdWRpb0NhcHR1cmVTb3Vy
Y2U6OnNldHRpbmdzKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlh
c3RyZWFtL2dzdHJlYW1lci9Nb2NrR1N0cmVhbWVyQXVkaW9DYXB0dXJlU291cmNlLmggYi9Tb3Vy
Y2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9nc3RyZWFtZXIvTW9ja0dTdHJlYW1lckF1
ZGlvQ2FwdHVyZVNvdXJjZS5oCmluZGV4IGJkOTk5ZjlmYTY3ZmJkNGYzYmEzMzc3YzAxYmE4YTEx
YjY3MTQzOTkuLjVkOTRhYjEzMWZkYmNlYzYyMTcyNzQ1OTM1MzhlZWFjNWNiMWQ2OTUgMTAwNjQ0
Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL2dzdHJlYW1lci9Nb2Nr
R1N0cmVhbWVyQXVkaW9DYXB0dXJlU291cmNlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv
cm0vbWVkaWFzdHJlYW0vZ3N0cmVhbWVyL01vY2tHU3RyZWFtZXJBdWRpb0NhcHR1cmVTb3VyY2Uu
aApAQCAtNDEsNyArNDEsNyBAQCBwcml2YXRlOgogICAgIGNvbnN0IFJlYWx0aW1lTWVkaWFTb3Vy
Y2VDYXBhYmlsaXRpZXMmIGNhcGFiaWxpdGllcygpIGZpbmFsOwogCiAgICAgdm9pZCBjYXB0dXJl
RmFpbGVkKCk7Ci0gICAgc3RkOjp1bmlxdWVfcHRyPFJlYWx0aW1lTWVkaWFTb3VyY2U+IG1fd3Jh
cHBlZFNvdXJjZTsKKyAgICBSZWY8UmVhbHRpbWVNZWRpYVNvdXJjZT4gbV93cmFwcGVkU291cmNl
OwogCiAgICAgdm9pZCB2aWRlb1NhbXBsZUF2YWlsYWJsZShNZWRpYVNhbXBsZSYpIG92ZXJyaWRl
IHsgfTsKIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVh
bS9nc3RyZWFtZXIvTW9ja0dTdHJlYW1lclZpZGVvQ2FwdHVyZVNvdXJjZS5jcHAgYi9Tb3VyY2Uv
V2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9nc3RyZWFtZXIvTW9ja0dTdHJlYW1lclZpZGVv
Q2FwdHVyZVNvdXJjZS5jcHAKaW5kZXggMmM3MmY1Yjg3ODY3ZmExZGRkZGI3MTc1MzcwYjI3M2Vj
YjRhYjQ0Ni4uZGU5NmE3NWQ4ZjZlNTZjZmQwNDc4NTZkZjA1Njc4Mjc1N2NlOGMzMCAxMDA2NDQK
LS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vZ3N0cmVhbWVyL01vY2tH
U3RyZWFtZXJWaWRlb0NhcHR1cmVTb3VyY2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm
b3JtL21lZGlhc3RyZWFtL2dzdHJlYW1lci9Nb2NrR1N0cmVhbWVyVmlkZW9DYXB0dXJlU291cmNl
LmNwcApAQCAtOTcsNyArOTcsNyBAQCB2b2lkIE1vY2tHU3RyZWFtZXJWaWRlb0NhcHR1cmVTb3Vy
Y2U6OnZpZGVvU2FtcGxlQXZhaWxhYmxlKE1lZGlhU2FtcGxlJiBzYW1wbGUpCiAKIE1vY2tHU3Ry
ZWFtZXJWaWRlb0NhcHR1cmVTb3VyY2U6Ok1vY2tHU3RyZWFtZXJWaWRlb0NhcHR1cmVTb3VyY2Uo
U3RyaW5nJiYgZGV2aWNlSUQsIFN0cmluZyYmIG5hbWUsIFN0cmluZyYmIGhhc2hTYWx0KQogICAg
IDogR1N0cmVhbWVyVmlkZW9DYXB0dXJlU291cmNlKFN0cmluZyB7IGRldmljZUlEIH0sIFN0cmlu
ZyB7IG5hbWUgfSwgU3RyaW5nIHsgaGFzaFNhbHQgfSwgImFwcHNyYyIpCi0gICAgLCBtX3dyYXBw
ZWRTb3VyY2Uoc3RkOjptYWtlX3VuaXF1ZTxXcmFwcGVkTW9ja1JlYWx0aW1lVmlkZW9Tb3VyY2U+
KFdURk1vdmUoZGV2aWNlSUQpLCBXVEZNb3ZlKG5hbWUpLCBXVEZNb3ZlKGhhc2hTYWx0KSkpCisg
ICAgLCBtX3dyYXBwZWRTb3VyY2UoYWRvcHRSZWYoKm5ldyBXcmFwcGVkTW9ja1JlYWx0aW1lVmlk
ZW9Tb3VyY2UoV1RGTW92ZShkZXZpY2VJRCksIFdURk1vdmUobmFtZSksIFdURk1vdmUoaGFzaFNh
bHQpKSkpCiB7CiAgICAgbV93cmFwcGVkU291cmNlLT5hZGRPYnNlcnZlcigqdGhpcyk7CiB9CmRp
ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9nc3RyZWFtZXIv
TW9ja0dTdHJlYW1lclZpZGVvQ2FwdHVyZVNvdXJjZS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv
cm0vbWVkaWFzdHJlYW0vZ3N0cmVhbWVyL01vY2tHU3RyZWFtZXJWaWRlb0NhcHR1cmVTb3VyY2Uu
aAppbmRleCA4OTdhMzFjNmY4Yjc5MmM5MjQ1ZjkxNmJlN2ZlYzY3NzEwM2JjYTI1Li41M2VjOTQ2
YmYxZDBmODVlNDFhMzgyZmVjYWRlMDgyYjZmMDYzMGJiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi
Q29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9nc3RyZWFtZXIvTW9ja0dTdHJlYW1lclZpZGVvQ2Fw
dHVyZVNvdXJjZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL2dz
dHJlYW1lci9Nb2NrR1N0cmVhbWVyVmlkZW9DYXB0dXJlU291cmNlLmgKQEAgLTQzLDcgKzQzLDcg
QEAgcHJpdmF0ZToKICAgICB2b2lkIHN0b3BQcm9kdWNpbmdEYXRhKCkgZmluYWw7CiAgICAgdm9p
ZCBzdGFydFByb2R1Y2luZ0RhdGEoKSBmaW5hbDsKICAgICBjb25zdCBSZWFsdGltZU1lZGlhU291
cmNlU2V0dGluZ3MmIHNldHRpbmdzKCkgZmluYWw7Ci0gICAgc3RkOjp1bmlxdWVfcHRyPFJlYWx0
aW1lTWVkaWFTb3VyY2U+IG1fd3JhcHBlZFNvdXJjZTsKKyAgICBSZWY8UmVhbHRpbWVNZWRpYVNv
dXJjZT4gbV93cmFwcGVkU291cmNlOwogICAgIGNvbnN0IFJlYWx0aW1lTWVkaWFTb3VyY2VDYXBh
YmlsaXRpZXMmIGNhcGFiaWxpdGllcygpIGZpbmFsOwogICAgIHZvaWQgY2FwdHVyZUZhaWxlZCgp
IG92ZXJyaWRlOwogCg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>373923</attachid>
            <date>2019-07-11 08:41:04 -0700</date>
            <delta_ts>2019-07-11 11:30:18 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-194326-20190711114103.patch</filename>
            <type>text/plain</type>
            <size>7797</size>
            <attacher name="Thibault Saunier">tsaunier</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ3MzQ3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWUyZTlhOWI4OWIwZjY1
OWE1NDNiZTE5NDBjOTQwZTFhOWJkODE1ZC4uNDQ4N2QxMGUyNWNhYjA1NDhkMTJlNmQyMWZkMGUx
ZTcxYjI4NzQwOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDE5LTA3LTExICBUaGli
YXVsdCBTYXVuaWVyICA8dHNhdW5pZXJAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1N0cmVhbWVy
XSBNb2NrIEdTdHJlYW1lciByZWFsdGltZSBzb3VyY2VzIHNob3VsZCBrZWVwIGEgUmVmIG9mIHRo
ZWlyIG1vY2sgcmVhbHRpbWUgbWVkaWEgc291cmNlcworICAgICAgICBodHRwczovL2J1Z3Mud2Vi
a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk0MzI2CisKKyAgICAgICAgV3JhcHBlZE1vY2tSZWFs
dGltZVZpZGVvU291cmNlIGlzIGEgc3ViY2xhc3Mgb2YgUmVhbHRpbWVNZWRpYVNvdXJjZSB3aGlj
aCBpcyByZWZjb3VudGVkLCB3ZSBjYW4ndAorICAgICAgICB1c2UgYSB1bmlxdWVfcHRyIG9uIHRo
b3NlLgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRo
aXMgZml4ZXMgTWVkaWFTdHJlYW0gdGVzdHMKKworICAgICAgICAqIHBsYXRmb3JtL21lZGlhc3Ry
ZWFtL2dzdHJlYW1lci9Nb2NrR1N0cmVhbWVyQXVkaW9DYXB0dXJlU291cmNlLmNwcDoKKyAgICAg
ICAgKFdlYkNvcmU6OldyYXBwZWRNb2NrUmVhbHRpbWVBdWRpb1NvdXJjZTo6Y3JlYXRlKToKKyAg
ICAgICAgKFdlYkNvcmU6OldyYXBwZWRNb2NrUmVhbHRpbWVBdWRpb1NvdXJjZTo6V3JhcHBlZE1v
Y2tSZWFsdGltZUF1ZGlvU291cmNlKToKKyAgICAgICAgKFdlYkNvcmU6Om1fd3JhcHBlZFNvdXJj
ZSk6CisgICAgICAgICogcGxhdGZvcm0vbWVkaWFzdHJlYW0vZ3N0cmVhbWVyL01vY2tHU3RyZWFt
ZXJBdWRpb0NhcHR1cmVTb3VyY2UuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9tZWRpYXN0cmVhbS9n
c3RyZWFtZXIvTW9ja0dTdHJlYW1lclZpZGVvQ2FwdHVyZVNvdXJjZS5jcHA6CisgICAgICAgIChX
ZWJDb3JlOjpXcmFwcGVkTW9ja1JlYWx0aW1lVmlkZW9Tb3VyY2U6OmNyZWF0ZSk6CisgICAgICAg
IChXZWJDb3JlOjpXcmFwcGVkTW9ja1JlYWx0aW1lVmlkZW9Tb3VyY2U6OnVwZGF0ZVNhbXBsZUJ1
ZmZlcik6CisgICAgICAgIChXZWJDb3JlOjpNb2NrR1N0cmVhbWVyVmlkZW9DYXB0dXJlU291cmNl
Ojp2aWRlb1NhbXBsZUF2YWlsYWJsZSk6CisgICAgICAgICogcGxhdGZvcm0vbWVkaWFzdHJlYW0v
Z3N0cmVhbWVyL01vY2tHU3RyZWFtZXJWaWRlb0NhcHR1cmVTb3VyY2UuaDoKKwogMjAxOS0wNy0x
MSAgVGhpYmF1bHQgU2F1bmllciAgPHRzYXVuaWVyQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dT
dHJlYW1lcl1bTWVkaWFTdHJlYW1dIFVzZSB0aGUgbmV3IGRpc3BhdGNoTWVkaWFTYW1wbGVUb09i
c2VydmVycyB0byBkaXNwYXRjaCBuZXcgYnVmZmVycwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv
cmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vZ3N0cmVhbWVyL01vY2tHU3RyZWFtZXJBdWRpb0NhcHR1
cmVTb3VyY2UuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vZ3N0cmVh
bWVyL01vY2tHU3RyZWFtZXJBdWRpb0NhcHR1cmVTb3VyY2UuY3BwCmluZGV4IDBmMWY3MzliMGNm
NmZlMGE4MWUwNTA2Y2U1ODc5M2NkYTQ1NTZkMzIuLjA2YjVmMGU3NzM5MTMzYzQ3N2MwNDkyZmY3
YjgyNDIxZWM3MWEzOWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlh
c3RyZWFtL2dzdHJlYW1lci9Nb2NrR1N0cmVhbWVyQXVkaW9DYXB0dXJlU291cmNlLmNwcAorKysg
Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9nc3RyZWFtZXIvTW9ja0dTdHJl
YW1lckF1ZGlvQ2FwdHVyZVNvdXJjZS5jcHAKQEAgLTQxLDEwICs0MSw5IEBAIHN0YXRpYyBjb25z
dCBkb3VibGUgc19IdW1Wb2x1bWUgPSAwLjE7CiAKIGNsYXNzIFdyYXBwZWRNb2NrUmVhbHRpbWVB
dWRpb1NvdXJjZSA6IHB1YmxpYyBNb2NrUmVhbHRpbWVBdWRpb1NvdXJjZSB7CiBwdWJsaWM6Ci0g
ICAgV3JhcHBlZE1vY2tSZWFsdGltZUF1ZGlvU291cmNlKFN0cmluZyYmIGRldmljZUlELCBTdHJp
bmcmJiBuYW1lLCBTdHJpbmcmJiBoYXNoU2FsdCkKLSAgICAgICAgOiBNb2NrUmVhbHRpbWVBdWRp
b1NvdXJjZShXVEZNb3ZlKGRldmljZUlEKSwgV1RGTW92ZShuYW1lKSwgV1RGTW92ZShoYXNoU2Fs
dCkpCi0gICAgICAgICwgbV9zcmMobnVsbHB0cikKKyAgICBzdGF0aWMgUmVmPFdyYXBwZWRNb2Nr
UmVhbHRpbWVBdWRpb1NvdXJjZT4gY3JlYXRlKFN0cmluZyYmIGRldmljZUlELCBTdHJpbmcmJiBu
YW1lLCBTdHJpbmcmJiBoYXNoU2FsdCkKICAgICB7CisgICAgICAgIHJldHVybiBhZG9wdFJlZigq
bmV3IFdyYXBwZWRNb2NrUmVhbHRpbWVBdWRpb1NvdXJjZShXVEZNb3ZlKGRldmljZUlEKSwgV1RG
TW92ZShuYW1lKSwgV1RGTW92ZShoYXNoU2FsdCkpKTsKICAgICB9CiAKICAgICB2b2lkIHN0YXJ0
KEdSZWZQdHI8R3N0RWxlbWVudD4gc3JjKQpAQCAtMTI4LDYgKzEyNywxMyBAQCBwdWJsaWM6CiAg
ICAgdWludDMyX3QgbV9tYXhpbWl1bUZyYW1lQ291bnQ7CiAgICAgdWludDY0X3QgbV9zYW1wbGVz
RW1pdHRlZCB7IDAgfTsKICAgICB1aW50NjRfdCBtX3NhbXBsZXNSZW5kZXJlZCB7IDAgfTsKKwor
cHJpdmF0ZToKKyAgICBXcmFwcGVkTW9ja1JlYWx0aW1lQXVkaW9Tb3VyY2UoU3RyaW5nJiYgZGV2
aWNlSUQsIFN0cmluZyYmIG5hbWUsIFN0cmluZyYmIGhhc2hTYWx0KQorICAgICAgICA6IE1vY2tS
ZWFsdGltZUF1ZGlvU291cmNlKFdURk1vdmUoZGV2aWNlSUQpLCBXVEZNb3ZlKG5hbWUpLCBXVEZN
b3ZlKGhhc2hTYWx0KSkKKyAgICAgICAgLCBtX3NyYyhudWxscHRyKQorICAgIHsKKyAgICB9CiB9
OwogCiBDYXB0dXJlU291cmNlT3JFcnJvciBNb2NrUmVhbHRpbWVBdWRpb1NvdXJjZTo6Y3JlYXRl
KFN0cmluZyYmIGRldmljZUlELApAQCAtMTU0LDcgKzE2MCw3IEBAIHZvaWQgTW9ja0dTdHJlYW1l
ckF1ZGlvQ2FwdHVyZVNvdXJjZTo6YXBwbHlDb25zdHJhaW50cyhjb25zdCBNZWRpYUNvbnN0cmFp
bnRzJiBjCiAKIE1vY2tHU3RyZWFtZXJBdWRpb0NhcHR1cmVTb3VyY2U6Ok1vY2tHU3RyZWFtZXJB
dWRpb0NhcHR1cmVTb3VyY2UoU3RyaW5nJiYgZGV2aWNlSUQsIFN0cmluZyYmIG5hbWUsIFN0cmlu
ZyYmIGhhc2hTYWx0KQogICAgIDogR1N0cmVhbWVyQXVkaW9DYXB0dXJlU291cmNlKFN0cmluZyB7
IGRldmljZUlEIH0sIFN0cmluZyB7IG5hbWUgfSwgU3RyaW5nIHsgaGFzaFNhbHQgfSkKLSAgICAs
IG1fd3JhcHBlZFNvdXJjZShzdGQ6Om1ha2VfdW5pcXVlPFdyYXBwZWRNb2NrUmVhbHRpbWVBdWRp
b1NvdXJjZT4oV1RGTW92ZShkZXZpY2VJRCksIFdURk1vdmUobmFtZSksIFdURk1vdmUoaGFzaFNh
bHQpKSkKKyAgICAsIG1fd3JhcHBlZFNvdXJjZShXcmFwcGVkTW9ja1JlYWx0aW1lQXVkaW9Tb3Vy
Y2U6OmNyZWF0ZShXVEZNb3ZlKGRldmljZUlEKSwgV1RGTW92ZShuYW1lKSwgV1RGTW92ZShoYXNo
U2FsdCkpKQogewogICAgIG1fd3JhcHBlZFNvdXJjZS0+YWRkT2JzZXJ2ZXIoKnRoaXMpOwogfQpA
QCAtMTc0LDcgKzE4MCw3IEBAIHZvaWQgTW9ja0dTdHJlYW1lckF1ZGlvQ2FwdHVyZVNvdXJjZTo6
c3RvcFByb2R1Y2luZ0RhdGEoKQogdm9pZCBNb2NrR1N0cmVhbWVyQXVkaW9DYXB0dXJlU291cmNl
OjpzdGFydFByb2R1Y2luZ0RhdGEoKQogewogICAgIEdTdHJlYW1lckF1ZGlvQ2FwdHVyZVNvdXJj
ZTo6c3RhcnRQcm9kdWNpbmdEYXRhKCk7Ci0gICAgc3RhdGljX2Nhc3Q8V3JhcHBlZE1vY2tSZWFs
dGltZUF1ZGlvU291cmNlKj4obV93cmFwcGVkU291cmNlLmdldCgpKS0+c3RhcnQoY2FwdHVyZXIo
KS0+c291cmNlKCkpOworICAgIHN0YXRpY19jYXN0PFdyYXBwZWRNb2NrUmVhbHRpbWVBdWRpb1Nv
dXJjZSY+KG1fd3JhcHBlZFNvdXJjZS5nZXQoKSkuc3RhcnQoY2FwdHVyZXIoKS0+c291cmNlKCkp
OwogfQogCiBjb25zdCBSZWFsdGltZU1lZGlhU291cmNlU2V0dGluZ3MmIE1vY2tHU3RyZWFtZXJB
dWRpb0NhcHR1cmVTb3VyY2U6OnNldHRpbmdzKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl
L3BsYXRmb3JtL21lZGlhc3RyZWFtL2dzdHJlYW1lci9Nb2NrR1N0cmVhbWVyQXVkaW9DYXB0dXJl
U291cmNlLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9nc3RyZWFtZXIv
TW9ja0dTdHJlYW1lckF1ZGlvQ2FwdHVyZVNvdXJjZS5oCmluZGV4IGJkOTk5ZjlmYTY3ZmJkNGYz
YmEzMzc3YzAxYmE4YTExYjY3MTQzOTkuLjVkOTRhYjEzMWZkYmNlYzYyMTcyNzQ1OTM1MzhlZWFj
NWNiMWQ2OTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFt
L2dzdHJlYW1lci9Nb2NrR1N0cmVhbWVyQXVkaW9DYXB0dXJlU291cmNlLmgKKysrIGIvU291cmNl
L1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vZ3N0cmVhbWVyL01vY2tHU3RyZWFtZXJBdWRp
b0NhcHR1cmVTb3VyY2UuaApAQCAtNDEsNyArNDEsNyBAQCBwcml2YXRlOgogICAgIGNvbnN0IFJl
YWx0aW1lTWVkaWFTb3VyY2VDYXBhYmlsaXRpZXMmIGNhcGFiaWxpdGllcygpIGZpbmFsOwogCiAg
ICAgdm9pZCBjYXB0dXJlRmFpbGVkKCk7Ci0gICAgc3RkOjp1bmlxdWVfcHRyPFJlYWx0aW1lTWVk
aWFTb3VyY2U+IG1fd3JhcHBlZFNvdXJjZTsKKyAgICBSZWY8UmVhbHRpbWVNZWRpYVNvdXJjZT4g
bV93cmFwcGVkU291cmNlOwogCiAgICAgdm9pZCB2aWRlb1NhbXBsZUF2YWlsYWJsZShNZWRpYVNh
bXBsZSYpIG92ZXJyaWRlIHsgfTsKIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0
Zm9ybS9tZWRpYXN0cmVhbS9nc3RyZWFtZXIvTW9ja0dTdHJlYW1lclZpZGVvQ2FwdHVyZVNvdXJj
ZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9nc3RyZWFtZXIvTW9j
a0dTdHJlYW1lclZpZGVvQ2FwdHVyZVNvdXJjZS5jcHAKaW5kZXggMmM3MmY1Yjg3ODY3ZmExZGRk
ZGI3MTc1MzcwYjI3M2VjYjRhYjQ0Ni4uYzJkMzVmYmNkYmMzZDE0ODk0Y2I3OTkwM2EyMjg4NWM3
YmFlN2E5NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0v
Z3N0cmVhbWVyL01vY2tHU3RyZWFtZXJWaWRlb0NhcHR1cmVTb3VyY2UuY3BwCisrKyBiL1NvdXJj
ZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL2dzdHJlYW1lci9Nb2NrR1N0cmVhbWVyVmlk
ZW9DYXB0dXJlU291cmNlLmNwcApAQCAtMzMsOSArMzMsOSBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7
CiAKIGNsYXNzIFdyYXBwZWRNb2NrUmVhbHRpbWVWaWRlb1NvdXJjZSA6IHB1YmxpYyBNb2NrUmVh
bHRpbWVWaWRlb1NvdXJjZSB7CiBwdWJsaWM6Ci0gICAgV3JhcHBlZE1vY2tSZWFsdGltZVZpZGVv
U291cmNlKFN0cmluZyYmIGRldmljZUlELCBTdHJpbmcmJiBuYW1lLCBTdHJpbmcmJiBoYXNoU2Fs
dCkKLSAgICAgICAgOiBNb2NrUmVhbHRpbWVWaWRlb1NvdXJjZShXVEZNb3ZlKGRldmljZUlEKSwg
V1RGTW92ZShuYW1lKSwgV1RGTW92ZShoYXNoU2FsdCkpCisgICAgc3RhdGljIFJlZjxXcmFwcGVk
TW9ja1JlYWx0aW1lVmlkZW9Tb3VyY2U+IGNyZWF0ZShTdHJpbmcmJiBkZXZpY2VJRCwgU3RyaW5n
JiYgbmFtZSwgU3RyaW5nJiYgaGFzaFNhbHQpCiAgICAgeworICAgICAgICByZXR1cm4gYWRvcHRS
ZWYoKm5ldyBXcmFwcGVkTW9ja1JlYWx0aW1lVmlkZW9Tb3VyY2UoV1RGTW92ZShkZXZpY2VJRCks
IFdURk1vdmUobmFtZSksIFdURk1vdmUoaGFzaFNhbHQpKSk7CiAgICAgfQogCiAgICAgdm9pZCB1
cGRhdGVTYW1wbGVCdWZmZXIoKQpAQCAtNTksNiArNTksMTIgQEAgcHVibGljOgogCiAgICAgICAg
IHZpZGVvU2FtcGxlQXZhaWxhYmxlKE1lZGlhU2FtcGxlR1N0cmVhbWVyOjpjcmVhdGUoV1RGTW92
ZShnc3RTYW1wbGUpLCBGbG9hdFNpemUoKSwgU3RyaW5nKCkpKTsKICAgICB9CisKK3ByaXZhdGU6
CisgICAgV3JhcHBlZE1vY2tSZWFsdGltZVZpZGVvU291cmNlKFN0cmluZyYmIGRldmljZUlELCBT
dHJpbmcmJiBuYW1lLCBTdHJpbmcmJiBoYXNoU2FsdCkKKyAgICAgICAgOiBNb2NrUmVhbHRpbWVW
aWRlb1NvdXJjZShXVEZNb3ZlKGRldmljZUlEKSwgV1RGTW92ZShuYW1lKSwgV1RGTW92ZShoYXNo
U2FsdCkpCisgICAgeworICAgIH0KIH07CiAKIENhcHR1cmVTb3VyY2VPckVycm9yIE1vY2tSZWFs
dGltZVZpZGVvU291cmNlOjpjcmVhdGUoU3RyaW5nJiYgZGV2aWNlSUQsCkBAIC05Nyw3ICsxMDMs
NyBAQCB2b2lkIE1vY2tHU3RyZWFtZXJWaWRlb0NhcHR1cmVTb3VyY2U6OnZpZGVvU2FtcGxlQXZh
aWxhYmxlKE1lZGlhU2FtcGxlJiBzYW1wbGUpCiAKIE1vY2tHU3RyZWFtZXJWaWRlb0NhcHR1cmVT
b3VyY2U6Ok1vY2tHU3RyZWFtZXJWaWRlb0NhcHR1cmVTb3VyY2UoU3RyaW5nJiYgZGV2aWNlSUQs
IFN0cmluZyYmIG5hbWUsIFN0cmluZyYmIGhhc2hTYWx0KQogICAgIDogR1N0cmVhbWVyVmlkZW9D
YXB0dXJlU291cmNlKFN0cmluZyB7IGRldmljZUlEIH0sIFN0cmluZyB7IG5hbWUgfSwgU3RyaW5n
IHsgaGFzaFNhbHQgfSwgImFwcHNyYyIpCi0gICAgLCBtX3dyYXBwZWRTb3VyY2Uoc3RkOjptYWtl
X3VuaXF1ZTxXcmFwcGVkTW9ja1JlYWx0aW1lVmlkZW9Tb3VyY2U+KFdURk1vdmUoZGV2aWNlSUQp
LCBXVEZNb3ZlKG5hbWUpLCBXVEZNb3ZlKGhhc2hTYWx0KSkpCisgICAgLCBtX3dyYXBwZWRTb3Vy
Y2UoV3JhcHBlZE1vY2tSZWFsdGltZVZpZGVvU291cmNlOjpjcmVhdGUoV1RGTW92ZShkZXZpY2VJ
RCksIFdURk1vdmUobmFtZSksIFdURk1vdmUoaGFzaFNhbHQpKSkKIHsKICAgICBtX3dyYXBwZWRT
b3VyY2UtPmFkZE9ic2VydmVyKCp0aGlzKTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl
L3BsYXRmb3JtL21lZGlhc3RyZWFtL2dzdHJlYW1lci9Nb2NrR1N0cmVhbWVyVmlkZW9DYXB0dXJl
U291cmNlLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9nc3RyZWFtZXIv
TW9ja0dTdHJlYW1lclZpZGVvQ2FwdHVyZVNvdXJjZS5oCmluZGV4IDg5N2EzMWM2ZjhiNzkyYzky
NDVmOTE2YmU3ZmVjNjc3MTAzYmNhMjUuLjUzZWM5NDZiZjFkMGY4NWU0MWEzODJmZWNhZGUwODJi
NmYwNjMwYmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFt
L2dzdHJlYW1lci9Nb2NrR1N0cmVhbWVyVmlkZW9DYXB0dXJlU291cmNlLmgKKysrIGIvU291cmNl
L1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vZ3N0cmVhbWVyL01vY2tHU3RyZWFtZXJWaWRl
b0NhcHR1cmVTb3VyY2UuaApAQCAtNDMsNyArNDMsNyBAQCBwcml2YXRlOgogICAgIHZvaWQgc3Rv
cFByb2R1Y2luZ0RhdGEoKSBmaW5hbDsKICAgICB2b2lkIHN0YXJ0UHJvZHVjaW5nRGF0YSgpIGZp
bmFsOwogICAgIGNvbnN0IFJlYWx0aW1lTWVkaWFTb3VyY2VTZXR0aW5ncyYgc2V0dGluZ3MoKSBm
aW5hbDsKLSAgICBzdGQ6OnVuaXF1ZV9wdHI8UmVhbHRpbWVNZWRpYVNvdXJjZT4gbV93cmFwcGVk
U291cmNlOworICAgIFJlZjxSZWFsdGltZU1lZGlhU291cmNlPiBtX3dyYXBwZWRTb3VyY2U7CiAg
ICAgY29uc3QgUmVhbHRpbWVNZWRpYVNvdXJjZUNhcGFiaWxpdGllcyYgY2FwYWJpbGl0aWVzKCkg
ZmluYWw7CiAgICAgdm9pZCBjYXB0dXJlRmFpbGVkKCkgb3ZlcnJpZGU7CiAK
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>373932</attachid>
            <date>2019-07-11 11:30:22 -0700</date>
            <delta_ts>2019-07-11 15:09:32 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-194326-20190711143020.patch</filename>
            <type>text/plain</type>
            <size>7986</size>
            <attacher name="Thibault Saunier">tsaunier</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ3MzQ3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWUyZTlhOWI4OWIwZjY1
OWE1NDNiZTE5NDBjOTQwZTFhOWJkODE1ZC4uNDQ4N2QxMGUyNWNhYjA1NDhkMTJlNmQyMWZkMGUx
ZTcxYjI4NzQwOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDE5LTA3LTExICBUaGli
YXVsdCBTYXVuaWVyICA8dHNhdW5pZXJAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1N0cmVhbWVy
XSBNb2NrIEdTdHJlYW1lciByZWFsdGltZSBzb3VyY2VzIHNob3VsZCBrZWVwIGEgUmVmIG9mIHRo
ZWlyIG1vY2sgcmVhbHRpbWUgbWVkaWEgc291cmNlcworICAgICAgICBodHRwczovL2J1Z3Mud2Vi
a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk0MzI2CisKKyAgICAgICAgV3JhcHBlZE1vY2tSZWFs
dGltZVZpZGVvU291cmNlIGlzIGEgc3ViY2xhc3Mgb2YgUmVhbHRpbWVNZWRpYVNvdXJjZSB3aGlj
aCBpcyByZWZjb3VudGVkLCB3ZSBjYW4ndAorICAgICAgICB1c2UgYSB1bmlxdWVfcHRyIG9uIHRo
b3NlLgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRo
aXMgZml4ZXMgTWVkaWFTdHJlYW0gdGVzdHMKKworICAgICAgICAqIHBsYXRmb3JtL21lZGlhc3Ry
ZWFtL2dzdHJlYW1lci9Nb2NrR1N0cmVhbWVyQXVkaW9DYXB0dXJlU291cmNlLmNwcDoKKyAgICAg
ICAgKFdlYkNvcmU6OldyYXBwZWRNb2NrUmVhbHRpbWVBdWRpb1NvdXJjZTo6Y3JlYXRlKToKKyAg
ICAgICAgKFdlYkNvcmU6OldyYXBwZWRNb2NrUmVhbHRpbWVBdWRpb1NvdXJjZTo6V3JhcHBlZE1v
Y2tSZWFsdGltZUF1ZGlvU291cmNlKToKKyAgICAgICAgKFdlYkNvcmU6Om1fd3JhcHBlZFNvdXJj
ZSk6CisgICAgICAgICogcGxhdGZvcm0vbWVkaWFzdHJlYW0vZ3N0cmVhbWVyL01vY2tHU3RyZWFt
ZXJBdWRpb0NhcHR1cmVTb3VyY2UuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9tZWRpYXN0cmVhbS9n
c3RyZWFtZXIvTW9ja0dTdHJlYW1lclZpZGVvQ2FwdHVyZVNvdXJjZS5jcHA6CisgICAgICAgIChX
ZWJDb3JlOjpXcmFwcGVkTW9ja1JlYWx0aW1lVmlkZW9Tb3VyY2U6OmNyZWF0ZSk6CisgICAgICAg
IChXZWJDb3JlOjpXcmFwcGVkTW9ja1JlYWx0aW1lVmlkZW9Tb3VyY2U6OnVwZGF0ZVNhbXBsZUJ1
ZmZlcik6CisgICAgICAgIChXZWJDb3JlOjpNb2NrR1N0cmVhbWVyVmlkZW9DYXB0dXJlU291cmNl
Ojp2aWRlb1NhbXBsZUF2YWlsYWJsZSk6CisgICAgICAgICogcGxhdGZvcm0vbWVkaWFzdHJlYW0v
Z3N0cmVhbWVyL01vY2tHU3RyZWFtZXJWaWRlb0NhcHR1cmVTb3VyY2UuaDoKKwogMjAxOS0wNy0x
MSAgVGhpYmF1bHQgU2F1bmllciAgPHRzYXVuaWVyQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dT
dHJlYW1lcl1bTWVkaWFTdHJlYW1dIFVzZSB0aGUgbmV3IGRpc3BhdGNoTWVkaWFTYW1wbGVUb09i
c2VydmVycyB0byBkaXNwYXRjaCBuZXcgYnVmZmVycwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv
cmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vZ3N0cmVhbWVyL01vY2tHU3RyZWFtZXJBdWRpb0NhcHR1
cmVTb3VyY2UuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vZ3N0cmVh
bWVyL01vY2tHU3RyZWFtZXJBdWRpb0NhcHR1cmVTb3VyY2UuY3BwCmluZGV4IDBmMWY3MzliMGNm
NmZlMGE4MWUwNTA2Y2U1ODc5M2NkYTQ1NTZkMzIuLjBiZThjZjQ5N2EwMjYzNjcwMjBlY2Y3ZjRk
ODU1OWJjZDcwYTk0M2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlh
c3RyZWFtL2dzdHJlYW1lci9Nb2NrR1N0cmVhbWVyQXVkaW9DYXB0dXJlU291cmNlLmNwcAorKysg
Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9nc3RyZWFtZXIvTW9ja0dTdHJl
YW1lckF1ZGlvQ2FwdHVyZVNvdXJjZS5jcHAKQEAgLTQxLDEwICs0MSw5IEBAIHN0YXRpYyBjb25z
dCBkb3VibGUgc19IdW1Wb2x1bWUgPSAwLjE7CiAKIGNsYXNzIFdyYXBwZWRNb2NrUmVhbHRpbWVB
dWRpb1NvdXJjZSA6IHB1YmxpYyBNb2NrUmVhbHRpbWVBdWRpb1NvdXJjZSB7CiBwdWJsaWM6Ci0g
ICAgV3JhcHBlZE1vY2tSZWFsdGltZUF1ZGlvU291cmNlKFN0cmluZyYmIGRldmljZUlELCBTdHJp
bmcmJiBuYW1lLCBTdHJpbmcmJiBoYXNoU2FsdCkKLSAgICAgICAgOiBNb2NrUmVhbHRpbWVBdWRp
b1NvdXJjZShXVEZNb3ZlKGRldmljZUlEKSwgV1RGTW92ZShuYW1lKSwgV1RGTW92ZShoYXNoU2Fs
dCkpCi0gICAgICAgICwgbV9zcmMobnVsbHB0cikKKyAgICBzdGF0aWMgUmVmPFdyYXBwZWRNb2Nr
UmVhbHRpbWVBdWRpb1NvdXJjZT4gY3JlYXRlKFN0cmluZyYmIGRldmljZUlELCBTdHJpbmcmJiBu
YW1lLCBTdHJpbmcmJiBoYXNoU2FsdCkKICAgICB7CisgICAgICAgIHJldHVybiBhZG9wdFJlZigq
bmV3IFdyYXBwZWRNb2NrUmVhbHRpbWVBdWRpb1NvdXJjZShXVEZNb3ZlKGRldmljZUlEKSwgV1RG
TW92ZShuYW1lKSwgV1RGTW92ZShoYXNoU2FsdCkpKTsKICAgICB9CiAKICAgICB2b2lkIHN0YXJ0
KEdSZWZQdHI8R3N0RWxlbWVudD4gc3JjKQpAQCAtMTI4LDYgKzEyNywxMiBAQCBwdWJsaWM6CiAg
ICAgdWludDMyX3QgbV9tYXhpbWl1bUZyYW1lQ291bnQ7CiAgICAgdWludDY0X3QgbV9zYW1wbGVz
RW1pdHRlZCB7IDAgfTsKICAgICB1aW50NjRfdCBtX3NhbXBsZXNSZW5kZXJlZCB7IDAgfTsKKwor
cHJpdmF0ZToKKyAgICBXcmFwcGVkTW9ja1JlYWx0aW1lQXVkaW9Tb3VyY2UoU3RyaW5nJiYgZGV2
aWNlSUQsIFN0cmluZyYmIG5hbWUsIFN0cmluZyYmIGhhc2hTYWx0KQorICAgICAgICA6IE1vY2tS
ZWFsdGltZUF1ZGlvU291cmNlKFdURk1vdmUoZGV2aWNlSUQpLCBXVEZNb3ZlKG5hbWUpLCBXVEZN
b3ZlKGhhc2hTYWx0KSkKKyAgICB7CisgICAgfQogfTsKIAogQ2FwdHVyZVNvdXJjZU9yRXJyb3Ig
TW9ja1JlYWx0aW1lQXVkaW9Tb3VyY2U6OmNyZWF0ZShTdHJpbmcmJiBkZXZpY2VJRCwKQEAgLTE1
NCw3ICsxNTksNyBAQCB2b2lkIE1vY2tHU3RyZWFtZXJBdWRpb0NhcHR1cmVTb3VyY2U6OmFwcGx5
Q29uc3RyYWludHMoY29uc3QgTWVkaWFDb25zdHJhaW50cyYgYwogCiBNb2NrR1N0cmVhbWVyQXVk
aW9DYXB0dXJlU291cmNlOjpNb2NrR1N0cmVhbWVyQXVkaW9DYXB0dXJlU291cmNlKFN0cmluZyYm
IGRldmljZUlELCBTdHJpbmcmJiBuYW1lLCBTdHJpbmcmJiBoYXNoU2FsdCkKICAgICA6IEdTdHJl
YW1lckF1ZGlvQ2FwdHVyZVNvdXJjZShTdHJpbmcgeyBkZXZpY2VJRCB9LCBTdHJpbmcgeyBuYW1l
IH0sIFN0cmluZyB7IGhhc2hTYWx0IH0pCi0gICAgLCBtX3dyYXBwZWRTb3VyY2Uoc3RkOjptYWtl
X3VuaXF1ZTxXcmFwcGVkTW9ja1JlYWx0aW1lQXVkaW9Tb3VyY2U+KFdURk1vdmUoZGV2aWNlSUQp
LCBXVEZNb3ZlKG5hbWUpLCBXVEZNb3ZlKGhhc2hTYWx0KSkpCisgICAgLCBtX3dyYXBwZWRTb3Vy
Y2UoV3JhcHBlZE1vY2tSZWFsdGltZUF1ZGlvU291cmNlOjpjcmVhdGUoV1RGTW92ZShkZXZpY2VJ
RCksIFdURk1vdmUobmFtZSksIFdURk1vdmUoaGFzaFNhbHQpKSkKIHsKICAgICBtX3dyYXBwZWRT
b3VyY2UtPmFkZE9ic2VydmVyKCp0aGlzKTsKIH0KQEAgLTE3NCw3ICsxNzksNyBAQCB2b2lkIE1v
Y2tHU3RyZWFtZXJBdWRpb0NhcHR1cmVTb3VyY2U6OnN0b3BQcm9kdWNpbmdEYXRhKCkKIHZvaWQg
TW9ja0dTdHJlYW1lckF1ZGlvQ2FwdHVyZVNvdXJjZTo6c3RhcnRQcm9kdWNpbmdEYXRhKCkKIHsK
ICAgICBHU3RyZWFtZXJBdWRpb0NhcHR1cmVTb3VyY2U6OnN0YXJ0UHJvZHVjaW5nRGF0YSgpOwot
ICAgIHN0YXRpY19jYXN0PFdyYXBwZWRNb2NrUmVhbHRpbWVBdWRpb1NvdXJjZSo+KG1fd3JhcHBl
ZFNvdXJjZS5nZXQoKSktPnN0YXJ0KGNhcHR1cmVyKCktPnNvdXJjZSgpKTsKKyAgICBzdGF0aWNf
Y2FzdDxXcmFwcGVkTW9ja1JlYWx0aW1lQXVkaW9Tb3VyY2UmPihtX3dyYXBwZWRTb3VyY2UuZ2V0
KCkpLnN0YXJ0KGNhcHR1cmVyKCktPnNvdXJjZSgpKTsKIH0KIAogY29uc3QgUmVhbHRpbWVNZWRp
YVNvdXJjZVNldHRpbmdzJiBNb2NrR1N0cmVhbWVyQXVkaW9DYXB0dXJlU291cmNlOjpzZXR0aW5n
cygpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9nc3Ry
ZWFtZXIvTW9ja0dTdHJlYW1lckF1ZGlvQ2FwdHVyZVNvdXJjZS5oIGIvU291cmNlL1dlYkNvcmUv
cGxhdGZvcm0vbWVkaWFzdHJlYW0vZ3N0cmVhbWVyL01vY2tHU3RyZWFtZXJBdWRpb0NhcHR1cmVT
b3VyY2UuaAppbmRleCBiZDk5OWY5ZmE2N2ZiZDRmM2JhMzM3N2MwMWJhOGExMWI2NzE0Mzk5Li41
YWI4NTkxMDhhYjVkYTZmYjYwNzk0YmRhMzY4YmUyMjJjOTc3YzNkIDEwMDY0NAotLS0gYS9Tb3Vy
Y2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9nc3RyZWFtZXIvTW9ja0dTdHJlYW1lckF1
ZGlvQ2FwdHVyZVNvdXJjZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3Ry
ZWFtL2dzdHJlYW1lci9Nb2NrR1N0cmVhbWVyQXVkaW9DYXB0dXJlU291cmNlLmgKQEAgLTM5LDEx
ICszOSwxMCBAQCBwcml2YXRlOgogICAgIHZvaWQgc3RhcnRQcm9kdWNpbmdEYXRhKCkgZmluYWw7
CiAgICAgY29uc3QgUmVhbHRpbWVNZWRpYVNvdXJjZVNldHRpbmdzJiBzZXR0aW5ncygpIGZpbmFs
OwogICAgIGNvbnN0IFJlYWx0aW1lTWVkaWFTb3VyY2VDYXBhYmlsaXRpZXMmIGNhcGFiaWxpdGll
cygpIGZpbmFsOwotCiAgICAgdm9pZCBjYXB0dXJlRmFpbGVkKCk7Ci0gICAgc3RkOjp1bmlxdWVf
cHRyPFJlYWx0aW1lTWVkaWFTb3VyY2U+IG1fd3JhcHBlZFNvdXJjZTsKLQogICAgIHZvaWQgdmlk
ZW9TYW1wbGVBdmFpbGFibGUoTWVkaWFTYW1wbGUmKSBvdmVycmlkZSB7IH07CisKKyAgICBSZWY8
UmVhbHRpbWVNZWRpYVNvdXJjZT4gbV93cmFwcGVkU291cmNlOwogfTsKIAogfSAvLyBuYW1lc3Bh
Y2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJl
YW0vZ3N0cmVhbWVyL01vY2tHU3RyZWFtZXJWaWRlb0NhcHR1cmVTb3VyY2UuY3BwIGIvU291cmNl
L1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vZ3N0cmVhbWVyL01vY2tHU3RyZWFtZXJWaWRl
b0NhcHR1cmVTb3VyY2UuY3BwCmluZGV4IDJjNzJmNWI4Nzg2N2ZhMWRkZGRiNzE3NTM3MGIyNzNl
Y2I0YWI0NDYuLmMyZDM1ZmJjZGJjM2QxNDg5NGNiNzk5MDNhMjI4ODVjN2JhZTdhOTcgMTAwNjQ0
Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL2dzdHJlYW1lci9Nb2Nr
R1N0cmVhbWVyVmlkZW9DYXB0dXJlU291cmNlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0
Zm9ybS9tZWRpYXN0cmVhbS9nc3RyZWFtZXIvTW9ja0dTdHJlYW1lclZpZGVvQ2FwdHVyZVNvdXJj
ZS5jcHAKQEAgLTMzLDkgKzMzLDkgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiBjbGFzcyBXcmFw
cGVkTW9ja1JlYWx0aW1lVmlkZW9Tb3VyY2UgOiBwdWJsaWMgTW9ja1JlYWx0aW1lVmlkZW9Tb3Vy
Y2UgewogcHVibGljOgotICAgIFdyYXBwZWRNb2NrUmVhbHRpbWVWaWRlb1NvdXJjZShTdHJpbmcm
JiBkZXZpY2VJRCwgU3RyaW5nJiYgbmFtZSwgU3RyaW5nJiYgaGFzaFNhbHQpCi0gICAgICAgIDog
TW9ja1JlYWx0aW1lVmlkZW9Tb3VyY2UoV1RGTW92ZShkZXZpY2VJRCksIFdURk1vdmUobmFtZSks
IFdURk1vdmUoaGFzaFNhbHQpKQorICAgIHN0YXRpYyBSZWY8V3JhcHBlZE1vY2tSZWFsdGltZVZp
ZGVvU291cmNlPiBjcmVhdGUoU3RyaW5nJiYgZGV2aWNlSUQsIFN0cmluZyYmIG5hbWUsIFN0cmlu
ZyYmIGhhc2hTYWx0KQogICAgIHsKKyAgICAgICAgcmV0dXJuIGFkb3B0UmVmKCpuZXcgV3JhcHBl
ZE1vY2tSZWFsdGltZVZpZGVvU291cmNlKFdURk1vdmUoZGV2aWNlSUQpLCBXVEZNb3ZlKG5hbWUp
LCBXVEZNb3ZlKGhhc2hTYWx0KSkpOwogICAgIH0KIAogICAgIHZvaWQgdXBkYXRlU2FtcGxlQnVm
ZmVyKCkKQEAgLTU5LDYgKzU5LDEyIEBAIHB1YmxpYzoKIAogICAgICAgICB2aWRlb1NhbXBsZUF2
YWlsYWJsZShNZWRpYVNhbXBsZUdTdHJlYW1lcjo6Y3JlYXRlKFdURk1vdmUoZ3N0U2FtcGxlKSwg
RmxvYXRTaXplKCksIFN0cmluZygpKSk7CiAgICAgfQorCitwcml2YXRlOgorICAgIFdyYXBwZWRN
b2NrUmVhbHRpbWVWaWRlb1NvdXJjZShTdHJpbmcmJiBkZXZpY2VJRCwgU3RyaW5nJiYgbmFtZSwg
U3RyaW5nJiYgaGFzaFNhbHQpCisgICAgICAgIDogTW9ja1JlYWx0aW1lVmlkZW9Tb3VyY2UoV1RG
TW92ZShkZXZpY2VJRCksIFdURk1vdmUobmFtZSksIFdURk1vdmUoaGFzaFNhbHQpKQorICAgIHsK
KyAgICB9CiB9OwogCiBDYXB0dXJlU291cmNlT3JFcnJvciBNb2NrUmVhbHRpbWVWaWRlb1NvdXJj
ZTo6Y3JlYXRlKFN0cmluZyYmIGRldmljZUlELApAQCAtOTcsNyArMTAzLDcgQEAgdm9pZCBNb2Nr
R1N0cmVhbWVyVmlkZW9DYXB0dXJlU291cmNlOjp2aWRlb1NhbXBsZUF2YWlsYWJsZShNZWRpYVNh
bXBsZSYgc2FtcGxlKQogCiBNb2NrR1N0cmVhbWVyVmlkZW9DYXB0dXJlU291cmNlOjpNb2NrR1N0
cmVhbWVyVmlkZW9DYXB0dXJlU291cmNlKFN0cmluZyYmIGRldmljZUlELCBTdHJpbmcmJiBuYW1l
LCBTdHJpbmcmJiBoYXNoU2FsdCkKICAgICA6IEdTdHJlYW1lclZpZGVvQ2FwdHVyZVNvdXJjZShT
dHJpbmcgeyBkZXZpY2VJRCB9LCBTdHJpbmcgeyBuYW1lIH0sIFN0cmluZyB7IGhhc2hTYWx0IH0s
ICJhcHBzcmMiKQotICAgICwgbV93cmFwcGVkU291cmNlKHN0ZDo6bWFrZV91bmlxdWU8V3JhcHBl
ZE1vY2tSZWFsdGltZVZpZGVvU291cmNlPihXVEZNb3ZlKGRldmljZUlEKSwgV1RGTW92ZShuYW1l
KSwgV1RGTW92ZShoYXNoU2FsdCkpKQorICAgICwgbV93cmFwcGVkU291cmNlKFdyYXBwZWRNb2Nr
UmVhbHRpbWVWaWRlb1NvdXJjZTo6Y3JlYXRlKFdURk1vdmUoZGV2aWNlSUQpLCBXVEZNb3ZlKG5h
bWUpLCBXVEZNb3ZlKGhhc2hTYWx0KSkpCiB7CiAgICAgbV93cmFwcGVkU291cmNlLT5hZGRPYnNl
cnZlcigqdGhpcyk7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRp
YXN0cmVhbS9nc3RyZWFtZXIvTW9ja0dTdHJlYW1lclZpZGVvQ2FwdHVyZVNvdXJjZS5oIGIvU291
cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vZ3N0cmVhbWVyL01vY2tHU3RyZWFtZXJW
aWRlb0NhcHR1cmVTb3VyY2UuaAppbmRleCA4OTdhMzFjNmY4Yjc5MmM5MjQ1ZjkxNmJlN2ZlYzY3
NzEwM2JjYTI1Li45ZWY5YjY2MDExOWRhM2ViN2NhMjBjNTFiZWFhOTdhNGEwMjQ2Yzk3IDEwMDY0
NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9nc3RyZWFtZXIvTW9j
a0dTdHJlYW1lclZpZGVvQ2FwdHVyZVNvdXJjZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm
b3JtL21lZGlhc3RyZWFtL2dzdHJlYW1lci9Nb2NrR1N0cmVhbWVyVmlkZW9DYXB0dXJlU291cmNl
LmgKQEAgLTQzLDExICs0MywxMSBAQCBwcml2YXRlOgogICAgIHZvaWQgc3RvcFByb2R1Y2luZ0Rh
dGEoKSBmaW5hbDsKICAgICB2b2lkIHN0YXJ0UHJvZHVjaW5nRGF0YSgpIGZpbmFsOwogICAgIGNv
bnN0IFJlYWx0aW1lTWVkaWFTb3VyY2VTZXR0aW5ncyYgc2V0dGluZ3MoKSBmaW5hbDsKLSAgICBz
dGQ6OnVuaXF1ZV9wdHI8UmVhbHRpbWVNZWRpYVNvdXJjZT4gbV93cmFwcGVkU291cmNlOwogICAg
IGNvbnN0IFJlYWx0aW1lTWVkaWFTb3VyY2VDYXBhYmlsaXRpZXMmIGNhcGFiaWxpdGllcygpIGZp
bmFsOwogICAgIHZvaWQgY2FwdHVyZUZhaWxlZCgpIG92ZXJyaWRlOwotCiAgICAgdm9pZCB2aWRl
b1NhbXBsZUF2YWlsYWJsZShNZWRpYVNhbXBsZSYpIG92ZXJyaWRlOworCisgICAgUmVmPFJlYWx0
aW1lTWVkaWFTb3VyY2U+IG1fd3JhcHBlZFNvdXJjZTsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdl
YkNvcmUK
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>373963</attachid>
            <date>2019-07-11 15:09:36 -0700</date>
            <delta_ts>2019-07-11 15:33:29 -0700</delta_ts>
            <desc>Patch for landing</desc>
            <filename>bug-194326-20190711180935.patch</filename>
            <type>text/plain</type>
            <size>9953</size>
            <attacher name="Thibault Saunier">tsaunier</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ3MzU5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjVmMTlmZTMxNjA3ZDRm
OTk5OWM0ZjcxYzIyN2YwYjQ3MGMwMDQyYy4uN2Q4YWFiMTYyMGU4MTUwMzFmODI3YTA0Y2U2NDQ2
NjNmNDg5MmZhMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDE5LTA3LTExICBUaGli
YXVsdCBTYXVuaWVyICA8dHNhdW5pZXJAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1N0cmVhbWVy
XSBNb2NrIEdTdHJlYW1lciByZWFsdGltZSBzb3VyY2VzIHNob3VsZCBrZWVwIGEgUmVmIG9mIHRo
ZWlyIG1vY2sgcmVhbHRpbWUgbWVkaWEgc291cmNlcworICAgICAgICBodHRwczovL2J1Z3Mud2Vi
a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk0MzI2CisKKyAgICAgICAgV3JhcHBlZE1vY2tSZWFs
dGltZVZpZGVvU291cmNlIGlzIGEgc3ViY2xhc3Mgb2YgUmVhbHRpbWVNZWRpYVNvdXJjZSB3aGlj
aCBpcyByZWZjb3VudGVkLCB3ZSBjYW4ndAorICAgICAgICB1c2UgYSB1bmlxdWVfcHRyIG9uIHRo
b3NlLgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRo
aXMgZml4ZXMgTWVkaWFTdHJlYW0gdGVzdHMKKworICAgICAgICAqIHBsYXRmb3JtL21lZGlhc3Ry
ZWFtL2dzdHJlYW1lci9Nb2NrR1N0cmVhbWVyQXVkaW9DYXB0dXJlU291cmNlLmNwcDoKKyAgICAg
ICAgKFdlYkNvcmU6OldyYXBwZWRNb2NrUmVhbHRpbWVBdWRpb1NvdXJjZTo6Y3JlYXRlKToKKyAg
ICAgICAgKFdlYkNvcmU6OldyYXBwZWRNb2NrUmVhbHRpbWVBdWRpb1NvdXJjZTo6V3JhcHBlZE1v
Y2tSZWFsdGltZUF1ZGlvU291cmNlKToKKyAgICAgICAgKFdlYkNvcmU6Om1fd3JhcHBlZFNvdXJj
ZSk6CisgICAgICAgICogcGxhdGZvcm0vbWVkaWFzdHJlYW0vZ3N0cmVhbWVyL01vY2tHU3RyZWFt
ZXJBdWRpb0NhcHR1cmVTb3VyY2UuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9tZWRpYXN0cmVhbS9n
c3RyZWFtZXIvTW9ja0dTdHJlYW1lclZpZGVvQ2FwdHVyZVNvdXJjZS5jcHA6CisgICAgICAgIChX
ZWJDb3JlOjpXcmFwcGVkTW9ja1JlYWx0aW1lVmlkZW9Tb3VyY2U6OmNyZWF0ZSk6CisgICAgICAg
IChXZWJDb3JlOjpXcmFwcGVkTW9ja1JlYWx0aW1lVmlkZW9Tb3VyY2U6OnVwZGF0ZVNhbXBsZUJ1
ZmZlcik6CisgICAgICAgIChXZWJDb3JlOjpNb2NrR1N0cmVhbWVyVmlkZW9DYXB0dXJlU291cmNl
Ojp2aWRlb1NhbXBsZUF2YWlsYWJsZSk6CisgICAgICAgICogcGxhdGZvcm0vbWVkaWFzdHJlYW0v
Z3N0cmVhbWVyL01vY2tHU3RyZWFtZXJWaWRlb0NhcHR1cmVTb3VyY2UuaDoKKwogMjAxOS0wNy0x
MSAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgogCiAgICAgICAgIERpc2FibGUgUkdC
MTAgSU9TdXJmYWNlIHBpeGVsIGZvcm1hdCBmb3IgTWFjIENhdGFseXN0CmRpZmYgLS1naXQgYS9T
b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9nc3RyZWFtZXIvTW9ja0dTdHJlYW1l
ckF1ZGlvQ2FwdHVyZVNvdXJjZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0
cmVhbS9nc3RyZWFtZXIvTW9ja0dTdHJlYW1lckF1ZGlvQ2FwdHVyZVNvdXJjZS5jcHAKaW5kZXgg
MGYxZjczOWIwY2Y2ZmUwYTgxZTA1MDZjZTU4NzkzY2RhNDU1NmQzMi4uNDJjYjljNmU5ZDdlMjhj
YTMwYzNhZDU4Njg0YWI0NGM1NDQ0YWEwOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxh
dGZvcm0vbWVkaWFzdHJlYW0vZ3N0cmVhbWVyL01vY2tHU3RyZWFtZXJBdWRpb0NhcHR1cmVTb3Vy
Y2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL2dzdHJlYW1l
ci9Nb2NrR1N0cmVhbWVyQXVkaW9DYXB0dXJlU291cmNlLmNwcApAQCAtNDEsMTAgKzQxLDE0IEBA
IHN0YXRpYyBjb25zdCBkb3VibGUgc19IdW1Wb2x1bWUgPSAwLjE7CiAKIGNsYXNzIFdyYXBwZWRN
b2NrUmVhbHRpbWVBdWRpb1NvdXJjZSA6IHB1YmxpYyBNb2NrUmVhbHRpbWVBdWRpb1NvdXJjZSB7
CiBwdWJsaWM6Ci0gICAgV3JhcHBlZE1vY2tSZWFsdGltZUF1ZGlvU291cmNlKFN0cmluZyYmIGRl
dmljZUlELCBTdHJpbmcmJiBuYW1lLCBTdHJpbmcmJiBoYXNoU2FsdCkKLSAgICAgICAgOiBNb2Nr
UmVhbHRpbWVBdWRpb1NvdXJjZShXVEZNb3ZlKGRldmljZUlEKSwgV1RGTW92ZShuYW1lKSwgV1RG
TW92ZShoYXNoU2FsdCkpCi0gICAgICAgICwgbV9zcmMobnVsbHB0cikKKyAgICBzdGF0aWMgUmVm
PFdyYXBwZWRNb2NrUmVhbHRpbWVBdWRpb1NvdXJjZT4gY3JlYXRlKFN0cmluZyYmIGRldmljZUlE
LCBTdHJpbmcmJiBuYW1lLCBTdHJpbmcmJiBoYXNoU2FsdCkKKyAgICB7CisgICAgICAgIHJldHVy
biBhZG9wdFJlZigqbmV3IFdyYXBwZWRNb2NrUmVhbHRpbWVBdWRpb1NvdXJjZShXVEZNb3ZlKGRl
dmljZUlEKSwgV1RGTW92ZShuYW1lKSwgV1RGTW92ZShoYXNoU2FsdCkpKTsKKyAgICB9CisKKyAg
ICBSZWFsdGltZU1lZGlhU291cmNlJiBhc1JlYWx0aW1lTWVkaWFTb3VyY2UoKQogICAgIHsKKyAg
ICAgICAgcmV0dXJuICp0aGlzOwogICAgIH0KIAogICAgIHZvaWQgc3RhcnQoR1JlZlB0cjxHc3RF
bGVtZW50PiBzcmMpCkBAIC0xMjgsNiArMTMyLDEyIEBAIHB1YmxpYzoKICAgICB1aW50MzJfdCBt
X21heGltaXVtRnJhbWVDb3VudDsKICAgICB1aW50NjRfdCBtX3NhbXBsZXNFbWl0dGVkIHsgMCB9
OwogICAgIHVpbnQ2NF90IG1fc2FtcGxlc1JlbmRlcmVkIHsgMCB9OworCitwcml2YXRlOgorICAg
IFdyYXBwZWRNb2NrUmVhbHRpbWVBdWRpb1NvdXJjZShTdHJpbmcmJiBkZXZpY2VJRCwgU3RyaW5n
JiYgbmFtZSwgU3RyaW5nJiYgaGFzaFNhbHQpCisgICAgICAgIDogTW9ja1JlYWx0aW1lQXVkaW9T
b3VyY2UoV1RGTW92ZShkZXZpY2VJRCksIFdURk1vdmUobmFtZSksIFdURk1vdmUoaGFzaFNhbHQp
KQorICAgIHsKKyAgICB9CiB9OwogCiBDYXB0dXJlU291cmNlT3JFcnJvciBNb2NrUmVhbHRpbWVB
dWRpb1NvdXJjZTo6Y3JlYXRlKFN0cmluZyYmIGRldmljZUlELApAQCAtMTU0LDcgKzE2NCw3IEBA
IHZvaWQgTW9ja0dTdHJlYW1lckF1ZGlvQ2FwdHVyZVNvdXJjZTo6YXBwbHlDb25zdHJhaW50cyhj
b25zdCBNZWRpYUNvbnN0cmFpbnRzJiBjCiAKIE1vY2tHU3RyZWFtZXJBdWRpb0NhcHR1cmVTb3Vy
Y2U6Ok1vY2tHU3RyZWFtZXJBdWRpb0NhcHR1cmVTb3VyY2UoU3RyaW5nJiYgZGV2aWNlSUQsIFN0
cmluZyYmIG5hbWUsIFN0cmluZyYmIGhhc2hTYWx0KQogICAgIDogR1N0cmVhbWVyQXVkaW9DYXB0
dXJlU291cmNlKFN0cmluZyB7IGRldmljZUlEIH0sIFN0cmluZyB7IG5hbWUgfSwgU3RyaW5nIHsg
aGFzaFNhbHQgfSkKLSAgICAsIG1fd3JhcHBlZFNvdXJjZShzdGQ6Om1ha2VfdW5pcXVlPFdyYXBw
ZWRNb2NrUmVhbHRpbWVBdWRpb1NvdXJjZT4oV1RGTW92ZShkZXZpY2VJRCksIFdURk1vdmUobmFt
ZSksIFdURk1vdmUoaGFzaFNhbHQpKSkKKyAgICAsIG1fd3JhcHBlZFNvdXJjZShXcmFwcGVkTW9j
a1JlYWx0aW1lQXVkaW9Tb3VyY2U6OmNyZWF0ZShXVEZNb3ZlKGRldmljZUlEKSwgV1RGTW92ZShu
YW1lKSwgV1RGTW92ZShoYXNoU2FsdCkpKQogewogICAgIG1fd3JhcHBlZFNvdXJjZS0+YWRkT2Jz
ZXJ2ZXIoKnRoaXMpOwogfQpAQCAtMTc0LDE5ICsxODQsMTkgQEAgdm9pZCBNb2NrR1N0cmVhbWVy
QXVkaW9DYXB0dXJlU291cmNlOjpzdG9wUHJvZHVjaW5nRGF0YSgpCiB2b2lkIE1vY2tHU3RyZWFt
ZXJBdWRpb0NhcHR1cmVTb3VyY2U6OnN0YXJ0UHJvZHVjaW5nRGF0YSgpCiB7CiAgICAgR1N0cmVh
bWVyQXVkaW9DYXB0dXJlU291cmNlOjpzdGFydFByb2R1Y2luZ0RhdGEoKTsKLSAgICBzdGF0aWNf
Y2FzdDxXcmFwcGVkTW9ja1JlYWx0aW1lQXVkaW9Tb3VyY2UqPihtX3dyYXBwZWRTb3VyY2UuZ2V0
KCkpLT5zdGFydChjYXB0dXJlcigpLT5zb3VyY2UoKSk7CisgICAgc3RhdGljX2Nhc3Q8V3JhcHBl
ZE1vY2tSZWFsdGltZUF1ZGlvU291cmNlJj4obV93cmFwcGVkU291cmNlLmdldCgpKS5zdGFydChj
YXB0dXJlcigpLT5zb3VyY2UoKSk7CiB9CiAKIGNvbnN0IFJlYWx0aW1lTWVkaWFTb3VyY2VTZXR0
aW5ncyYgTW9ja0dTdHJlYW1lckF1ZGlvQ2FwdHVyZVNvdXJjZTo6c2V0dGluZ3MoKQogewotICAg
IHJldHVybiBtX3dyYXBwZWRTb3VyY2UtPnNldHRpbmdzKCk7CisgICAgcmV0dXJuIG1fd3JhcHBl
ZFNvdXJjZS0+YXNSZWFsdGltZU1lZGlhU291cmNlKCkuc2V0dGluZ3MoKTsKIH0KIAogY29uc3Qg
UmVhbHRpbWVNZWRpYVNvdXJjZUNhcGFiaWxpdGllcyYgTW9ja0dTdHJlYW1lckF1ZGlvQ2FwdHVy
ZVNvdXJjZTo6Y2FwYWJpbGl0aWVzKCkKIHsKLSAgICBtX2NhcGFiaWxpdGllcyA9IG1fd3JhcHBl
ZFNvdXJjZS0+Y2FwYWJpbGl0aWVzKCk7Ci0gICAgbV9jdXJyZW50U2V0dGluZ3MgPSBtX3dyYXBw
ZWRTb3VyY2UtPnNldHRpbmdzKCk7Ci0gICAgcmV0dXJuIG1fd3JhcHBlZFNvdXJjZS0+Y2FwYWJp
bGl0aWVzKCk7CisgICAgbV9jYXBhYmlsaXRpZXMgPSBtX3dyYXBwZWRTb3VyY2UtPmFzUmVhbHRp
bWVNZWRpYVNvdXJjZSgpLmNhcGFiaWxpdGllcygpOworICAgIG1fY3VycmVudFNldHRpbmdzID0g
bV93cmFwcGVkU291cmNlLT5hc1JlYWx0aW1lTWVkaWFTb3VyY2UoKS5zZXR0aW5ncygpOworICAg
IHJldHVybiBtX3dyYXBwZWRTb3VyY2UtPmFzUmVhbHRpbWVNZWRpYVNvdXJjZSgpLmNhcGFiaWxp
dGllcygpOwogfQogCiB2b2lkIE1vY2tHU3RyZWFtZXJBdWRpb0NhcHR1cmVTb3VyY2U6OmNhcHR1
cmVGYWlsZWQoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJl
YW0vZ3N0cmVhbWVyL01vY2tHU3RyZWFtZXJBdWRpb0NhcHR1cmVTb3VyY2UuaCBiL1NvdXJjZS9X
ZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL2dzdHJlYW1lci9Nb2NrR1N0cmVhbWVyQXVkaW9D
YXB0dXJlU291cmNlLmgKaW5kZXggYmQ5OTlmOWZhNjdmYmQ0ZjNiYTMzNzdjMDFiYThhMTFiNjcx
NDM5OS4uZTMwMjVjMjVhNzZhN2M5MDFjYTU2NmZlNmNhMmIxMDdlYmU5N2I4OCAxMDA2NDQKLS0t
IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vZ3N0cmVhbWVyL01vY2tHU3Ry
ZWFtZXJBdWRpb0NhcHR1cmVTb3VyY2UuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9t
ZWRpYXN0cmVhbS9nc3RyZWFtZXIvTW9ja0dTdHJlYW1lckF1ZGlvQ2FwdHVyZVNvdXJjZS5oCkBA
IC0yNyw2ICsyNyw3IEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAorY2xhc3MgV3JhcHBlZE1v
Y2tSZWFsdGltZUF1ZGlvU291cmNlOwogY2xhc3MgTW9ja0dTdHJlYW1lckF1ZGlvQ2FwdHVyZVNv
dXJjZSBmaW5hbCA6IHB1YmxpYyBHU3RyZWFtZXJBdWRpb0NhcHR1cmVTb3VyY2UsIFJlYWx0aW1l
TWVkaWFTb3VyY2U6Ok9ic2VydmVyIHsKIHB1YmxpYzoKICAgICBNb2NrR1N0cmVhbWVyQXVkaW9D
YXB0dXJlU291cmNlKFN0cmluZyYmIGRldmljZUlELCBTdHJpbmcmJiBuYW1lLCBTdHJpbmcmJiBo
YXNoU2FsdCk7CkBAIC0zOSwxMSArNDAsMTAgQEAgcHJpdmF0ZToKICAgICB2b2lkIHN0YXJ0UHJv
ZHVjaW5nRGF0YSgpIGZpbmFsOwogICAgIGNvbnN0IFJlYWx0aW1lTWVkaWFTb3VyY2VTZXR0aW5n
cyYgc2V0dGluZ3MoKSBmaW5hbDsKICAgICBjb25zdCBSZWFsdGltZU1lZGlhU291cmNlQ2FwYWJp
bGl0aWVzJiBjYXBhYmlsaXRpZXMoKSBmaW5hbDsKKyAgICB2b2lkIGNhcHR1cmVGYWlsZWQoKSBm
aW5hbDsKKyAgICB2b2lkIHZpZGVvU2FtcGxlQXZhaWxhYmxlKE1lZGlhU2FtcGxlJikgZmluYWwg
eyB9OwogCi0gICAgdm9pZCBjYXB0dXJlRmFpbGVkKCk7Ci0gICAgc3RkOjp1bmlxdWVfcHRyPFJl
YWx0aW1lTWVkaWFTb3VyY2U+IG1fd3JhcHBlZFNvdXJjZTsKLQotICAgIHZvaWQgdmlkZW9TYW1w
bGVBdmFpbGFibGUoTWVkaWFTYW1wbGUmKSBvdmVycmlkZSB7IH07CisgICAgUmVmPFdyYXBwZWRN
b2NrUmVhbHRpbWVBdWRpb1NvdXJjZT4gbV93cmFwcGVkU291cmNlOwogfTsKIAogfSAvLyBuYW1l
c3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFz
dHJlYW0vZ3N0cmVhbWVyL01vY2tHU3RyZWFtZXJWaWRlb0NhcHR1cmVTb3VyY2UuY3BwIGIvU291
cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vZ3N0cmVhbWVyL01vY2tHU3RyZWFtZXJW
aWRlb0NhcHR1cmVTb3VyY2UuY3BwCmluZGV4IDJjNzJmNWI4Nzg2N2ZhMWRkZGRiNzE3NTM3MGIy
NzNlY2I0YWI0NDYuLmE0OGZjYzhmNmY2NDJkNjZmOWZjYjg5ODg1YmFkYmViYzJjMGNmMTMgMTAw
NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL2dzdHJlYW1lci9N
b2NrR1N0cmVhbWVyVmlkZW9DYXB0dXJlU291cmNlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9w
bGF0Zm9ybS9tZWRpYXN0cmVhbS9nc3RyZWFtZXIvTW9ja0dTdHJlYW1lclZpZGVvQ2FwdHVyZVNv
dXJjZS5jcHAKQEAgLTMzLDkgKzMzLDE0IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogY2xhc3Mg
V3JhcHBlZE1vY2tSZWFsdGltZVZpZGVvU291cmNlIDogcHVibGljIE1vY2tSZWFsdGltZVZpZGVv
U291cmNlIHsKIHB1YmxpYzoKLSAgICBXcmFwcGVkTW9ja1JlYWx0aW1lVmlkZW9Tb3VyY2UoU3Ry
aW5nJiYgZGV2aWNlSUQsIFN0cmluZyYmIG5hbWUsIFN0cmluZyYmIGhhc2hTYWx0KQotICAgICAg
ICA6IE1vY2tSZWFsdGltZVZpZGVvU291cmNlKFdURk1vdmUoZGV2aWNlSUQpLCBXVEZNb3ZlKG5h
bWUpLCBXVEZNb3ZlKGhhc2hTYWx0KSkKKyAgICBzdGF0aWMgUmVmPFdyYXBwZWRNb2NrUmVhbHRp
bWVWaWRlb1NvdXJjZT4gY3JlYXRlKFN0cmluZyYmIGRldmljZUlELCBTdHJpbmcmJiBuYW1lLCBT
dHJpbmcmJiBoYXNoU2FsdCkKKyAgICB7CisgICAgICAgIHJldHVybiBhZG9wdFJlZigqbmV3IFdy
YXBwZWRNb2NrUmVhbHRpbWVWaWRlb1NvdXJjZShXVEZNb3ZlKGRldmljZUlEKSwgV1RGTW92ZShu
YW1lKSwgV1RGTW92ZShoYXNoU2FsdCkpKTsKKyAgICB9CisKKyAgICBSZWFsdGltZU1lZGlhU291
cmNlJiBhc1JlYWx0aW1lTWVkaWFTb3VyY2UoKQogICAgIHsKKyAgICAgICAgcmV0dXJuICp0aGlz
OwogICAgIH0KIAogICAgIHZvaWQgdXBkYXRlU2FtcGxlQnVmZmVyKCkKQEAgLTU5LDYgKzY0LDEy
IEBAIHB1YmxpYzoKIAogICAgICAgICB2aWRlb1NhbXBsZUF2YWlsYWJsZShNZWRpYVNhbXBsZUdT
dHJlYW1lcjo6Y3JlYXRlKFdURk1vdmUoZ3N0U2FtcGxlKSwgRmxvYXRTaXplKCksIFN0cmluZygp
KSk7CiAgICAgfQorCitwcml2YXRlOgorICAgIFdyYXBwZWRNb2NrUmVhbHRpbWVWaWRlb1NvdXJj
ZShTdHJpbmcmJiBkZXZpY2VJRCwgU3RyaW5nJiYgbmFtZSwgU3RyaW5nJiYgaGFzaFNhbHQpCisg
ICAgICAgIDogTW9ja1JlYWx0aW1lVmlkZW9Tb3VyY2UoV1RGTW92ZShkZXZpY2VJRCksIFdURk1v
dmUobmFtZSksIFdURk1vdmUoaGFzaFNhbHQpKQorICAgIHsKKyAgICB9CiB9OwogCiBDYXB0dXJl
U291cmNlT3JFcnJvciBNb2NrUmVhbHRpbWVWaWRlb1NvdXJjZTo6Y3JlYXRlKFN0cmluZyYmIGRl
dmljZUlELApAQCAtOTcsNyArMTA4LDcgQEAgdm9pZCBNb2NrR1N0cmVhbWVyVmlkZW9DYXB0dXJl
U291cmNlOjp2aWRlb1NhbXBsZUF2YWlsYWJsZShNZWRpYVNhbXBsZSYgc2FtcGxlKQogCiBNb2Nr
R1N0cmVhbWVyVmlkZW9DYXB0dXJlU291cmNlOjpNb2NrR1N0cmVhbWVyVmlkZW9DYXB0dXJlU291
cmNlKFN0cmluZyYmIGRldmljZUlELCBTdHJpbmcmJiBuYW1lLCBTdHJpbmcmJiBoYXNoU2FsdCkK
ICAgICA6IEdTdHJlYW1lclZpZGVvQ2FwdHVyZVNvdXJjZShTdHJpbmcgeyBkZXZpY2VJRCB9LCBT
dHJpbmcgeyBuYW1lIH0sIFN0cmluZyB7IGhhc2hTYWx0IH0sICJhcHBzcmMiKQotICAgICwgbV93
cmFwcGVkU291cmNlKHN0ZDo6bWFrZV91bmlxdWU8V3JhcHBlZE1vY2tSZWFsdGltZVZpZGVvU291
cmNlPihXVEZNb3ZlKGRldmljZUlEKSwgV1RGTW92ZShuYW1lKSwgV1RGTW92ZShoYXNoU2FsdCkp
KQorICAgICwgbV93cmFwcGVkU291cmNlKFdyYXBwZWRNb2NrUmVhbHRpbWVWaWRlb1NvdXJjZTo6
Y3JlYXRlKFdURk1vdmUoZGV2aWNlSUQpLCBXVEZNb3ZlKG5hbWUpLCBXVEZNb3ZlKGhhc2hTYWx0
KSkpCiB7CiAgICAgbV93cmFwcGVkU291cmNlLT5hZGRPYnNlcnZlcigqdGhpcyk7CiB9CkBAIC0x
MjAsMTMgKzEzMSwxMyBAQCB2b2lkIE1vY2tHU3RyZWFtZXJWaWRlb0NhcHR1cmVTb3VyY2U6OmFw
cGx5Q29uc3RyYWludHMoY29uc3QgTWVkaWFDb25zdHJhaW50cyYgYwogCiBjb25zdCBSZWFsdGlt
ZU1lZGlhU291cmNlU2V0dGluZ3MmIE1vY2tHU3RyZWFtZXJWaWRlb0NhcHR1cmVTb3VyY2U6OnNl
dHRpbmdzKCkKIHsKLSAgICByZXR1cm4gbV93cmFwcGVkU291cmNlLT5zZXR0aW5ncygpOworICAg
IHJldHVybiBtX3dyYXBwZWRTb3VyY2UtPmFzUmVhbHRpbWVNZWRpYVNvdXJjZSgpLnNldHRpbmdz
KCk7CiB9CiAKIGNvbnN0IFJlYWx0aW1lTWVkaWFTb3VyY2VDYXBhYmlsaXRpZXMmIE1vY2tHU3Ry
ZWFtZXJWaWRlb0NhcHR1cmVTb3VyY2U6OmNhcGFiaWxpdGllcygpCiB7Ci0gICAgbV9jYXBhYmls
aXRpZXMgPSBtX3dyYXBwZWRTb3VyY2UtPmNhcGFiaWxpdGllcygpOwotICAgIG1fY3VycmVudFNl
dHRpbmdzID0gbV93cmFwcGVkU291cmNlLT5zZXR0aW5ncygpOworICAgIG1fY2FwYWJpbGl0aWVz
ID0gbV93cmFwcGVkU291cmNlLT5hc1JlYWx0aW1lTWVkaWFTb3VyY2UoKS5jYXBhYmlsaXRpZXMo
KTsKKyAgICBtX2N1cnJlbnRTZXR0aW5ncyA9IG1fd3JhcHBlZFNvdXJjZS0+YXNSZWFsdGltZU1l
ZGlhU291cmNlKCkuc2V0dGluZ3MoKTsKICAgICByZXR1cm4gbV9jYXBhYmlsaXRpZXMudmFsdWUo
KTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0v
Z3N0cmVhbWVyL01vY2tHU3RyZWFtZXJWaWRlb0NhcHR1cmVTb3VyY2UuaCBiL1NvdXJjZS9XZWJD
b3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL2dzdHJlYW1lci9Nb2NrR1N0cmVhbWVyVmlkZW9DYXB0
dXJlU291cmNlLmgKaW5kZXggODk3YTMxYzZmOGI3OTJjOTI0NWY5MTZiZTdmZWM2NzcxMDNiY2Ey
NS4uY2IxODQ0NWFmYWI0MTgwNjY0N2QzYmUwZTQ0ODcxMTk1ZjAyOGFhYyAxMDA2NDQKLS0tIGEv
U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vZ3N0cmVhbWVyL01vY2tHU3RyZWFt
ZXJWaWRlb0NhcHR1cmVTb3VyY2UuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRp
YXN0cmVhbS9nc3RyZWFtZXIvTW9ja0dTdHJlYW1lclZpZGVvQ2FwdHVyZVNvdXJjZS5oCkBAIC00
MywxMSArNDMsMTEgQEAgcHJpdmF0ZToKICAgICB2b2lkIHN0b3BQcm9kdWNpbmdEYXRhKCkgZmlu
YWw7CiAgICAgdm9pZCBzdGFydFByb2R1Y2luZ0RhdGEoKSBmaW5hbDsKICAgICBjb25zdCBSZWFs
dGltZU1lZGlhU291cmNlU2V0dGluZ3MmIHNldHRpbmdzKCkgZmluYWw7Ci0gICAgc3RkOjp1bmlx
dWVfcHRyPFJlYWx0aW1lTWVkaWFTb3VyY2U+IG1fd3JhcHBlZFNvdXJjZTsKICAgICBjb25zdCBS
ZWFsdGltZU1lZGlhU291cmNlQ2FwYWJpbGl0aWVzJiBjYXBhYmlsaXRpZXMoKSBmaW5hbDsKLSAg
ICB2b2lkIGNhcHR1cmVGYWlsZWQoKSBvdmVycmlkZTsKKyAgICB2b2lkIGNhcHR1cmVGYWlsZWQo
KSBmaW5hbDsKKyAgICB2b2lkIHZpZGVvU2FtcGxlQXZhaWxhYmxlKE1lZGlhU2FtcGxlJikgZmlu
YWw7CiAKLSAgICB2b2lkIHZpZGVvU2FtcGxlQXZhaWxhYmxlKE1lZGlhU2FtcGxlJikgb3ZlcnJp
ZGU7CisgICAgUmVmPFdyYXBwZWRNb2NrUmVhbHRpbWVWaWRlb1NvdXJjZT4gbV93cmFwcGVkU291
cmNlOwogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>373966</attachid>
            <date>2019-07-11 15:33:33 -0700</date>
            <delta_ts>2019-07-12 06:27:14 -0700</delta_ts>
            <desc>Patch for landing</desc>
            <filename>bug-194326-20190711183332.patch</filename>
            <type>text/plain</type>
            <size>10629</size>
            <attacher name="Thibault Saunier">tsaunier</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ3MzU5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjVmMTlmZTMxNjA3ZDRm
OTk5OWM0ZjcxYzIyN2YwYjQ3MGMwMDQyYy4uYWU2NmQ3NzEwMmE1YmM5ZTEyYTMwOTczNDk0OTFj
ZTQ1YWE2ZDQzYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM3IEBACisyMDE5LTA3LTExICBUaGli
YXVsdCBTYXVuaWVyICA8dHNhdW5pZXJAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1N0cmVhbWVy
XSBNb2NrIEdTdHJlYW1lciByZWFsdGltZSBzb3VyY2VzIHNob3VsZCBrZWVwIGEgUmVmIG9mIHRo
ZWlyIG1vY2sgcmVhbHRpbWUgbWVkaWEgc291cmNlcworICAgICAgICBodHRwczovL2J1Z3Mud2Vi
a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk0MzI2CisKKyAgICAgICAgV3JhcHBlZE1vY2tSZWFs
dGltZVZpZGVvU291cmNlIGlzIGEgc3ViY2xhc3Mgb2YgUmVhbHRpbWVNZWRpYVNvdXJjZSB3aGlj
aCBpcyByZWZjb3VudGVkLCB3ZSBjYW4ndAorICAgICAgICB1c2UgYSB1bmlxdWVfcHRyIG9uIHRo
b3NlLgorCisgICAgICAgIEFsc28gY2hhbmdlZCBtX3dyYXBwZWRTb3VyY2UgdHlwZSB0byBpdHMg
YWN0dWFsIHR5cGUgc28gaXQgaXMgY2xlYW5lciBldmVuIGlmIG5lZWRlZAorICAgICAgICB0byB1
cGNhc3QgaXQgdG8gUmVhbHRpbWVNZWRpYVNvdXJjZSBzbyBzb21lIG1ldGhvZCB0aGF0IGFyZSBt
YWRlIHByaXZhdGUgaW4gdGhlIG1vY2sKKyAgICAgICAgY2FuIHN0aWxsIGJlIGNhbGxlZC4KKwor
ICAgICAgICBSZXZpZXdlZCBieSBZb3Vlbm4gRmFibGV0LgorCisgICAgICAgIFRoaXMgZml4ZXMg
TWVkaWFTdHJlYW0gdGVzdHMKKworICAgICAgICAqIHBsYXRmb3JtL21lZGlhc3RyZWFtL2dzdHJl
YW1lci9Nb2NrR1N0cmVhbWVyQXVkaW9DYXB0dXJlU291cmNlLmNwcDoKKyAgICAgICAgKFdlYkNv
cmU6OldyYXBwZWRNb2NrUmVhbHRpbWVBdWRpb1NvdXJjZTo6Y3JlYXRlKToKKyAgICAgICAgKFdl
YkNvcmU6OldyYXBwZWRNb2NrUmVhbHRpbWVBdWRpb1NvdXJjZTo6YXNSZWFsdGltZU1lZGlhU291
cmNlKToKKyAgICAgICAgKFdlYkNvcmU6OldyYXBwZWRNb2NrUmVhbHRpbWVBdWRpb1NvdXJjZTo6
V3JhcHBlZE1vY2tSZWFsdGltZUF1ZGlvU291cmNlKToKKyAgICAgICAgKFdlYkNvcmU6Om1fd3Jh
cHBlZFNvdXJjZSk6CisgICAgICAgIChXZWJDb3JlOjpNb2NrR1N0cmVhbWVyQXVkaW9DYXB0dXJl
U291cmNlOjpzdGFydFByb2R1Y2luZ0RhdGEpOgorICAgICAgICAoV2ViQ29yZTo6TW9ja0dTdHJl
YW1lckF1ZGlvQ2FwdHVyZVNvdXJjZTo6c2V0dGluZ3MpOgorICAgICAgICAoV2ViQ29yZTo6TW9j
a0dTdHJlYW1lckF1ZGlvQ2FwdHVyZVNvdXJjZTo6Y2FwYWJpbGl0aWVzKToKKyAgICAgICAgKiBw
bGF0Zm9ybS9tZWRpYXN0cmVhbS9nc3RyZWFtZXIvTW9ja0dTdHJlYW1lckF1ZGlvQ2FwdHVyZVNv
dXJjZS5oOgorICAgICAgICAqIHBsYXRmb3JtL21lZGlhc3RyZWFtL2dzdHJlYW1lci9Nb2NrR1N0
cmVhbWVyVmlkZW9DYXB0dXJlU291cmNlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OldyYXBwZWRN
b2NrUmVhbHRpbWVWaWRlb1NvdXJjZTo6Y3JlYXRlKToKKyAgICAgICAgKFdlYkNvcmU6OldyYXBw
ZWRNb2NrUmVhbHRpbWVWaWRlb1NvdXJjZTo6YXNSZWFsdGltZU1lZGlhU291cmNlKToKKyAgICAg
ICAgKFdlYkNvcmU6OldyYXBwZWRNb2NrUmVhbHRpbWVWaWRlb1NvdXJjZTo6V3JhcHBlZE1vY2tS
ZWFsdGltZVZpZGVvU291cmNlKToKKyAgICAgICAgKFdlYkNvcmU6Om1fd3JhcHBlZFNvdXJjZSk6
CisgICAgICAgIChXZWJDb3JlOjpNb2NrR1N0cmVhbWVyVmlkZW9DYXB0dXJlU291cmNlOjpzZXR0
aW5ncyk6CisgICAgICAgIChXZWJDb3JlOjpNb2NrR1N0cmVhbWVyVmlkZW9DYXB0dXJlU291cmNl
OjpjYXBhYmlsaXRpZXMpOgorICAgICAgICAqIHBsYXRmb3JtL21lZGlhc3RyZWFtL2dzdHJlYW1l
ci9Nb2NrR1N0cmVhbWVyVmlkZW9DYXB0dXJlU291cmNlLmg6CisKIDIwMTktMDctMTEgIENocmlz
IER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBEaXNhYmxlIFJHQjEwIElPU3Vy
ZmFjZSBwaXhlbCBmb3JtYXQgZm9yIE1hYyBDYXRhbHlzdApkaWZmIC0tZ2l0IGEvU291cmNlL1dl
YkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vZ3N0cmVhbWVyL01vY2tHU3RyZWFtZXJBdWRpb0Nh
cHR1cmVTb3VyY2UuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vZ3N0
cmVhbWVyL01vY2tHU3RyZWFtZXJBdWRpb0NhcHR1cmVTb3VyY2UuY3BwCmluZGV4IDBmMWY3Mzli
MGNmNmZlMGE4MWUwNTA2Y2U1ODc5M2NkYTQ1NTZkMzIuLjQyY2I5YzZlOWQ3ZTI4Y2EzMGMzYWQ1
ODY4NGFiNDRjNTQ0NGFhMDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21l
ZGlhc3RyZWFtL2dzdHJlYW1lci9Nb2NrR1N0cmVhbWVyQXVkaW9DYXB0dXJlU291cmNlLmNwcAor
KysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9nc3RyZWFtZXIvTW9ja0dT
dHJlYW1lckF1ZGlvQ2FwdHVyZVNvdXJjZS5jcHAKQEAgLTQxLDEwICs0MSwxNCBAQCBzdGF0aWMg
Y29uc3QgZG91YmxlIHNfSHVtVm9sdW1lID0gMC4xOwogCiBjbGFzcyBXcmFwcGVkTW9ja1JlYWx0
aW1lQXVkaW9Tb3VyY2UgOiBwdWJsaWMgTW9ja1JlYWx0aW1lQXVkaW9Tb3VyY2UgewogcHVibGlj
OgotICAgIFdyYXBwZWRNb2NrUmVhbHRpbWVBdWRpb1NvdXJjZShTdHJpbmcmJiBkZXZpY2VJRCwg
U3RyaW5nJiYgbmFtZSwgU3RyaW5nJiYgaGFzaFNhbHQpCi0gICAgICAgIDogTW9ja1JlYWx0aW1l
QXVkaW9Tb3VyY2UoV1RGTW92ZShkZXZpY2VJRCksIFdURk1vdmUobmFtZSksIFdURk1vdmUoaGFz
aFNhbHQpKQotICAgICAgICAsIG1fc3JjKG51bGxwdHIpCisgICAgc3RhdGljIFJlZjxXcmFwcGVk
TW9ja1JlYWx0aW1lQXVkaW9Tb3VyY2U+IGNyZWF0ZShTdHJpbmcmJiBkZXZpY2VJRCwgU3RyaW5n
JiYgbmFtZSwgU3RyaW5nJiYgaGFzaFNhbHQpCisgICAgeworICAgICAgICByZXR1cm4gYWRvcHRS
ZWYoKm5ldyBXcmFwcGVkTW9ja1JlYWx0aW1lQXVkaW9Tb3VyY2UoV1RGTW92ZShkZXZpY2VJRCks
IFdURk1vdmUobmFtZSksIFdURk1vdmUoaGFzaFNhbHQpKSk7CisgICAgfQorCisgICAgUmVhbHRp
bWVNZWRpYVNvdXJjZSYgYXNSZWFsdGltZU1lZGlhU291cmNlKCkKICAgICB7CisgICAgICAgIHJl
dHVybiAqdGhpczsKICAgICB9CiAKICAgICB2b2lkIHN0YXJ0KEdSZWZQdHI8R3N0RWxlbWVudD4g
c3JjKQpAQCAtMTI4LDYgKzEzMiwxMiBAQCBwdWJsaWM6CiAgICAgdWludDMyX3QgbV9tYXhpbWl1
bUZyYW1lQ291bnQ7CiAgICAgdWludDY0X3QgbV9zYW1wbGVzRW1pdHRlZCB7IDAgfTsKICAgICB1
aW50NjRfdCBtX3NhbXBsZXNSZW5kZXJlZCB7IDAgfTsKKworcHJpdmF0ZToKKyAgICBXcmFwcGVk
TW9ja1JlYWx0aW1lQXVkaW9Tb3VyY2UoU3RyaW5nJiYgZGV2aWNlSUQsIFN0cmluZyYmIG5hbWUs
IFN0cmluZyYmIGhhc2hTYWx0KQorICAgICAgICA6IE1vY2tSZWFsdGltZUF1ZGlvU291cmNlKFdU
Rk1vdmUoZGV2aWNlSUQpLCBXVEZNb3ZlKG5hbWUpLCBXVEZNb3ZlKGhhc2hTYWx0KSkKKyAgICB7
CisgICAgfQogfTsKIAogQ2FwdHVyZVNvdXJjZU9yRXJyb3IgTW9ja1JlYWx0aW1lQXVkaW9Tb3Vy
Y2U6OmNyZWF0ZShTdHJpbmcmJiBkZXZpY2VJRCwKQEAgLTE1NCw3ICsxNjQsNyBAQCB2b2lkIE1v
Y2tHU3RyZWFtZXJBdWRpb0NhcHR1cmVTb3VyY2U6OmFwcGx5Q29uc3RyYWludHMoY29uc3QgTWVk
aWFDb25zdHJhaW50cyYgYwogCiBNb2NrR1N0cmVhbWVyQXVkaW9DYXB0dXJlU291cmNlOjpNb2Nr
R1N0cmVhbWVyQXVkaW9DYXB0dXJlU291cmNlKFN0cmluZyYmIGRldmljZUlELCBTdHJpbmcmJiBu
YW1lLCBTdHJpbmcmJiBoYXNoU2FsdCkKICAgICA6IEdTdHJlYW1lckF1ZGlvQ2FwdHVyZVNvdXJj
ZShTdHJpbmcgeyBkZXZpY2VJRCB9LCBTdHJpbmcgeyBuYW1lIH0sIFN0cmluZyB7IGhhc2hTYWx0
IH0pCi0gICAgLCBtX3dyYXBwZWRTb3VyY2Uoc3RkOjptYWtlX3VuaXF1ZTxXcmFwcGVkTW9ja1Jl
YWx0aW1lQXVkaW9Tb3VyY2U+KFdURk1vdmUoZGV2aWNlSUQpLCBXVEZNb3ZlKG5hbWUpLCBXVEZN
b3ZlKGhhc2hTYWx0KSkpCisgICAgLCBtX3dyYXBwZWRTb3VyY2UoV3JhcHBlZE1vY2tSZWFsdGlt
ZUF1ZGlvU291cmNlOjpjcmVhdGUoV1RGTW92ZShkZXZpY2VJRCksIFdURk1vdmUobmFtZSksIFdU
Rk1vdmUoaGFzaFNhbHQpKSkKIHsKICAgICBtX3dyYXBwZWRTb3VyY2UtPmFkZE9ic2VydmVyKCp0
aGlzKTsKIH0KQEAgLTE3NCwxOSArMTg0LDE5IEBAIHZvaWQgTW9ja0dTdHJlYW1lckF1ZGlvQ2Fw
dHVyZVNvdXJjZTo6c3RvcFByb2R1Y2luZ0RhdGEoKQogdm9pZCBNb2NrR1N0cmVhbWVyQXVkaW9D
YXB0dXJlU291cmNlOjpzdGFydFByb2R1Y2luZ0RhdGEoKQogewogICAgIEdTdHJlYW1lckF1ZGlv
Q2FwdHVyZVNvdXJjZTo6c3RhcnRQcm9kdWNpbmdEYXRhKCk7Ci0gICAgc3RhdGljX2Nhc3Q8V3Jh
cHBlZE1vY2tSZWFsdGltZUF1ZGlvU291cmNlKj4obV93cmFwcGVkU291cmNlLmdldCgpKS0+c3Rh
cnQoY2FwdHVyZXIoKS0+c291cmNlKCkpOworICAgIHN0YXRpY19jYXN0PFdyYXBwZWRNb2NrUmVh
bHRpbWVBdWRpb1NvdXJjZSY+KG1fd3JhcHBlZFNvdXJjZS5nZXQoKSkuc3RhcnQoY2FwdHVyZXIo
KS0+c291cmNlKCkpOwogfQogCiBjb25zdCBSZWFsdGltZU1lZGlhU291cmNlU2V0dGluZ3MmIE1v
Y2tHU3RyZWFtZXJBdWRpb0NhcHR1cmVTb3VyY2U6OnNldHRpbmdzKCkKIHsKLSAgICByZXR1cm4g
bV93cmFwcGVkU291cmNlLT5zZXR0aW5ncygpOworICAgIHJldHVybiBtX3dyYXBwZWRTb3VyY2Ut
PmFzUmVhbHRpbWVNZWRpYVNvdXJjZSgpLnNldHRpbmdzKCk7CiB9CiAKIGNvbnN0IFJlYWx0aW1l
TWVkaWFTb3VyY2VDYXBhYmlsaXRpZXMmIE1vY2tHU3RyZWFtZXJBdWRpb0NhcHR1cmVTb3VyY2U6
OmNhcGFiaWxpdGllcygpCiB7Ci0gICAgbV9jYXBhYmlsaXRpZXMgPSBtX3dyYXBwZWRTb3VyY2Ut
PmNhcGFiaWxpdGllcygpOwotICAgIG1fY3VycmVudFNldHRpbmdzID0gbV93cmFwcGVkU291cmNl
LT5zZXR0aW5ncygpOwotICAgIHJldHVybiBtX3dyYXBwZWRTb3VyY2UtPmNhcGFiaWxpdGllcygp
OworICAgIG1fY2FwYWJpbGl0aWVzID0gbV93cmFwcGVkU291cmNlLT5hc1JlYWx0aW1lTWVkaWFT
b3VyY2UoKS5jYXBhYmlsaXRpZXMoKTsKKyAgICBtX2N1cnJlbnRTZXR0aW5ncyA9IG1fd3JhcHBl
ZFNvdXJjZS0+YXNSZWFsdGltZU1lZGlhU291cmNlKCkuc2V0dGluZ3MoKTsKKyAgICByZXR1cm4g
bV93cmFwcGVkU291cmNlLT5hc1JlYWx0aW1lTWVkaWFTb3VyY2UoKS5jYXBhYmlsaXRpZXMoKTsK
IH0KIAogdm9pZCBNb2NrR1N0cmVhbWVyQXVkaW9DYXB0dXJlU291cmNlOjpjYXB0dXJlRmFpbGVk
KCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL2dzdHJl
YW1lci9Nb2NrR1N0cmVhbWVyQXVkaW9DYXB0dXJlU291cmNlLmggYi9Tb3VyY2UvV2ViQ29yZS9w
bGF0Zm9ybS9tZWRpYXN0cmVhbS9nc3RyZWFtZXIvTW9ja0dTdHJlYW1lckF1ZGlvQ2FwdHVyZVNv
dXJjZS5oCmluZGV4IGJkOTk5ZjlmYTY3ZmJkNGYzYmEzMzc3YzAxYmE4YTExYjY3MTQzOTkuLmUz
MDI1YzI1YTc2YTdjOTAxY2E1NjZmZTZjYTJiMTA3ZWJlOTdiODggMTAwNjQ0Ci0tLSBhL1NvdXJj
ZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL2dzdHJlYW1lci9Nb2NrR1N0cmVhbWVyQXVk
aW9DYXB0dXJlU291cmNlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJl
YW0vZ3N0cmVhbWVyL01vY2tHU3RyZWFtZXJBdWRpb0NhcHR1cmVTb3VyY2UuaApAQCAtMjcsNiAr
MjcsNyBAQAogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKK2NsYXNzIFdyYXBwZWRNb2NrUmVhbHRp
bWVBdWRpb1NvdXJjZTsKIGNsYXNzIE1vY2tHU3RyZWFtZXJBdWRpb0NhcHR1cmVTb3VyY2UgZmlu
YWwgOiBwdWJsaWMgR1N0cmVhbWVyQXVkaW9DYXB0dXJlU291cmNlLCBSZWFsdGltZU1lZGlhU291
cmNlOjpPYnNlcnZlciB7CiBwdWJsaWM6CiAgICAgTW9ja0dTdHJlYW1lckF1ZGlvQ2FwdHVyZVNv
dXJjZShTdHJpbmcmJiBkZXZpY2VJRCwgU3RyaW5nJiYgbmFtZSwgU3RyaW5nJiYgaGFzaFNhbHQp
OwpAQCAtMzksMTEgKzQwLDEwIEBAIHByaXZhdGU6CiAgICAgdm9pZCBzdGFydFByb2R1Y2luZ0Rh
dGEoKSBmaW5hbDsKICAgICBjb25zdCBSZWFsdGltZU1lZGlhU291cmNlU2V0dGluZ3MmIHNldHRp
bmdzKCkgZmluYWw7CiAgICAgY29uc3QgUmVhbHRpbWVNZWRpYVNvdXJjZUNhcGFiaWxpdGllcyYg
Y2FwYWJpbGl0aWVzKCkgZmluYWw7CisgICAgdm9pZCBjYXB0dXJlRmFpbGVkKCkgZmluYWw7Cisg
ICAgdm9pZCB2aWRlb1NhbXBsZUF2YWlsYWJsZShNZWRpYVNhbXBsZSYpIGZpbmFsIHsgfTsKIAot
ICAgIHZvaWQgY2FwdHVyZUZhaWxlZCgpOwotICAgIHN0ZDo6dW5pcXVlX3B0cjxSZWFsdGltZU1l
ZGlhU291cmNlPiBtX3dyYXBwZWRTb3VyY2U7Ci0KLSAgICB2b2lkIHZpZGVvU2FtcGxlQXZhaWxh
YmxlKE1lZGlhU2FtcGxlJikgb3ZlcnJpZGUgeyB9OworICAgIFJlZjxXcmFwcGVkTW9ja1JlYWx0
aW1lQXVkaW9Tb3VyY2U+IG1fd3JhcHBlZFNvdXJjZTsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdl
YkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL2dz
dHJlYW1lci9Nb2NrR1N0cmVhbWVyVmlkZW9DYXB0dXJlU291cmNlLmNwcCBiL1NvdXJjZS9XZWJD
b3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL2dzdHJlYW1lci9Nb2NrR1N0cmVhbWVyVmlkZW9DYXB0
dXJlU291cmNlLmNwcAppbmRleCAyYzcyZjViODc4NjdmYTFkZGRkYjcxNzUzNzBiMjczZWNiNGFi
NDQ2Li5hNDhmY2M4ZjZmNjQyZDY2ZjlmY2I4OTg4NWJhZGJlYmMyYzBjZjEzIDEwMDY0NAotLS0g
YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9nc3RyZWFtZXIvTW9ja0dTdHJl
YW1lclZpZGVvQ2FwdHVyZVNvdXJjZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v
bWVkaWFzdHJlYW0vZ3N0cmVhbWVyL01vY2tHU3RyZWFtZXJWaWRlb0NhcHR1cmVTb3VyY2UuY3Bw
CkBAIC0zMyw5ICszMywxNCBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIGNsYXNzIFdyYXBwZWRN
b2NrUmVhbHRpbWVWaWRlb1NvdXJjZSA6IHB1YmxpYyBNb2NrUmVhbHRpbWVWaWRlb1NvdXJjZSB7
CiBwdWJsaWM6Ci0gICAgV3JhcHBlZE1vY2tSZWFsdGltZVZpZGVvU291cmNlKFN0cmluZyYmIGRl
dmljZUlELCBTdHJpbmcmJiBuYW1lLCBTdHJpbmcmJiBoYXNoU2FsdCkKLSAgICAgICAgOiBNb2Nr
UmVhbHRpbWVWaWRlb1NvdXJjZShXVEZNb3ZlKGRldmljZUlEKSwgV1RGTW92ZShuYW1lKSwgV1RG
TW92ZShoYXNoU2FsdCkpCisgICAgc3RhdGljIFJlZjxXcmFwcGVkTW9ja1JlYWx0aW1lVmlkZW9T
b3VyY2U+IGNyZWF0ZShTdHJpbmcmJiBkZXZpY2VJRCwgU3RyaW5nJiYgbmFtZSwgU3RyaW5nJiYg
aGFzaFNhbHQpCisgICAgeworICAgICAgICByZXR1cm4gYWRvcHRSZWYoKm5ldyBXcmFwcGVkTW9j
a1JlYWx0aW1lVmlkZW9Tb3VyY2UoV1RGTW92ZShkZXZpY2VJRCksIFdURk1vdmUobmFtZSksIFdU
Rk1vdmUoaGFzaFNhbHQpKSk7CisgICAgfQorCisgICAgUmVhbHRpbWVNZWRpYVNvdXJjZSYgYXNS
ZWFsdGltZU1lZGlhU291cmNlKCkKICAgICB7CisgICAgICAgIHJldHVybiAqdGhpczsKICAgICB9
CiAKICAgICB2b2lkIHVwZGF0ZVNhbXBsZUJ1ZmZlcigpCkBAIC01OSw2ICs2NCwxMiBAQCBwdWJs
aWM6CiAKICAgICAgICAgdmlkZW9TYW1wbGVBdmFpbGFibGUoTWVkaWFTYW1wbGVHU3RyZWFtZXI6
OmNyZWF0ZShXVEZNb3ZlKGdzdFNhbXBsZSksIEZsb2F0U2l6ZSgpLCBTdHJpbmcoKSkpOwogICAg
IH0KKworcHJpdmF0ZToKKyAgICBXcmFwcGVkTW9ja1JlYWx0aW1lVmlkZW9Tb3VyY2UoU3RyaW5n
JiYgZGV2aWNlSUQsIFN0cmluZyYmIG5hbWUsIFN0cmluZyYmIGhhc2hTYWx0KQorICAgICAgICA6
IE1vY2tSZWFsdGltZVZpZGVvU291cmNlKFdURk1vdmUoZGV2aWNlSUQpLCBXVEZNb3ZlKG5hbWUp
LCBXVEZNb3ZlKGhhc2hTYWx0KSkKKyAgICB7CisgICAgfQogfTsKIAogQ2FwdHVyZVNvdXJjZU9y
RXJyb3IgTW9ja1JlYWx0aW1lVmlkZW9Tb3VyY2U6OmNyZWF0ZShTdHJpbmcmJiBkZXZpY2VJRCwK
QEAgLTk3LDcgKzEwOCw3IEBAIHZvaWQgTW9ja0dTdHJlYW1lclZpZGVvQ2FwdHVyZVNvdXJjZTo6
dmlkZW9TYW1wbGVBdmFpbGFibGUoTWVkaWFTYW1wbGUmIHNhbXBsZSkKIAogTW9ja0dTdHJlYW1l
clZpZGVvQ2FwdHVyZVNvdXJjZTo6TW9ja0dTdHJlYW1lclZpZGVvQ2FwdHVyZVNvdXJjZShTdHJp
bmcmJiBkZXZpY2VJRCwgU3RyaW5nJiYgbmFtZSwgU3RyaW5nJiYgaGFzaFNhbHQpCiAgICAgOiBH
U3RyZWFtZXJWaWRlb0NhcHR1cmVTb3VyY2UoU3RyaW5nIHsgZGV2aWNlSUQgfSwgU3RyaW5nIHsg
bmFtZSB9LCBTdHJpbmcgeyBoYXNoU2FsdCB9LCAiYXBwc3JjIikKLSAgICAsIG1fd3JhcHBlZFNv
dXJjZShzdGQ6Om1ha2VfdW5pcXVlPFdyYXBwZWRNb2NrUmVhbHRpbWVWaWRlb1NvdXJjZT4oV1RG
TW92ZShkZXZpY2VJRCksIFdURk1vdmUobmFtZSksIFdURk1vdmUoaGFzaFNhbHQpKSkKKyAgICAs
IG1fd3JhcHBlZFNvdXJjZShXcmFwcGVkTW9ja1JlYWx0aW1lVmlkZW9Tb3VyY2U6OmNyZWF0ZShX
VEZNb3ZlKGRldmljZUlEKSwgV1RGTW92ZShuYW1lKSwgV1RGTW92ZShoYXNoU2FsdCkpKQogewog
ICAgIG1fd3JhcHBlZFNvdXJjZS0+YWRkT2JzZXJ2ZXIoKnRoaXMpOwogfQpAQCAtMTIwLDEzICsx
MzEsMTMgQEAgdm9pZCBNb2NrR1N0cmVhbWVyVmlkZW9DYXB0dXJlU291cmNlOjphcHBseUNvbnN0
cmFpbnRzKGNvbnN0IE1lZGlhQ29uc3RyYWludHMmIGMKIAogY29uc3QgUmVhbHRpbWVNZWRpYVNv
dXJjZVNldHRpbmdzJiBNb2NrR1N0cmVhbWVyVmlkZW9DYXB0dXJlU291cmNlOjpzZXR0aW5ncygp
CiB7Ci0gICAgcmV0dXJuIG1fd3JhcHBlZFNvdXJjZS0+c2V0dGluZ3MoKTsKKyAgICByZXR1cm4g
bV93cmFwcGVkU291cmNlLT5hc1JlYWx0aW1lTWVkaWFTb3VyY2UoKS5zZXR0aW5ncygpOwogfQog
CiBjb25zdCBSZWFsdGltZU1lZGlhU291cmNlQ2FwYWJpbGl0aWVzJiBNb2NrR1N0cmVhbWVyVmlk
ZW9DYXB0dXJlU291cmNlOjpjYXBhYmlsaXRpZXMoKQogewotICAgIG1fY2FwYWJpbGl0aWVzID0g
bV93cmFwcGVkU291cmNlLT5jYXBhYmlsaXRpZXMoKTsKLSAgICBtX2N1cnJlbnRTZXR0aW5ncyA9
IG1fd3JhcHBlZFNvdXJjZS0+c2V0dGluZ3MoKTsKKyAgICBtX2NhcGFiaWxpdGllcyA9IG1fd3Jh
cHBlZFNvdXJjZS0+YXNSZWFsdGltZU1lZGlhU291cmNlKCkuY2FwYWJpbGl0aWVzKCk7CisgICAg
bV9jdXJyZW50U2V0dGluZ3MgPSBtX3dyYXBwZWRTb3VyY2UtPmFzUmVhbHRpbWVNZWRpYVNvdXJj
ZSgpLnNldHRpbmdzKCk7CiAgICAgcmV0dXJuIG1fY2FwYWJpbGl0aWVzLnZhbHVlKCk7CiB9CiAK
ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL2dzdHJlYW1l
ci9Nb2NrR1N0cmVhbWVyVmlkZW9DYXB0dXJlU291cmNlLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0
Zm9ybS9tZWRpYXN0cmVhbS9nc3RyZWFtZXIvTW9ja0dTdHJlYW1lclZpZGVvQ2FwdHVyZVNvdXJj
ZS5oCmluZGV4IDg5N2EzMWM2ZjhiNzkyYzkyNDVmOTE2YmU3ZmVjNjc3MTAzYmNhMjUuLmNiMTg0
NDVhZmFiNDE4MDY2NDdkM2JlMGU0NDg3MTE5NWYwMjhhYWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X
ZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL2dzdHJlYW1lci9Nb2NrR1N0cmVhbWVyVmlkZW9D
YXB0dXJlU291cmNlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0v
Z3N0cmVhbWVyL01vY2tHU3RyZWFtZXJWaWRlb0NhcHR1cmVTb3VyY2UuaApAQCAtNDMsMTEgKzQz
LDExIEBAIHByaXZhdGU6CiAgICAgdm9pZCBzdG9wUHJvZHVjaW5nRGF0YSgpIGZpbmFsOwogICAg
IHZvaWQgc3RhcnRQcm9kdWNpbmdEYXRhKCkgZmluYWw7CiAgICAgY29uc3QgUmVhbHRpbWVNZWRp
YVNvdXJjZVNldHRpbmdzJiBzZXR0aW5ncygpIGZpbmFsOwotICAgIHN0ZDo6dW5pcXVlX3B0cjxS
ZWFsdGltZU1lZGlhU291cmNlPiBtX3dyYXBwZWRTb3VyY2U7CiAgICAgY29uc3QgUmVhbHRpbWVN
ZWRpYVNvdXJjZUNhcGFiaWxpdGllcyYgY2FwYWJpbGl0aWVzKCkgZmluYWw7Ci0gICAgdm9pZCBj
YXB0dXJlRmFpbGVkKCkgb3ZlcnJpZGU7CisgICAgdm9pZCBjYXB0dXJlRmFpbGVkKCkgZmluYWw7
CisgICAgdm9pZCB2aWRlb1NhbXBsZUF2YWlsYWJsZShNZWRpYVNhbXBsZSYpIGZpbmFsOwogCi0g
ICAgdm9pZCB2aWRlb1NhbXBsZUF2YWlsYWJsZShNZWRpYVNhbXBsZSYpIG92ZXJyaWRlOworICAg
IFJlZjxXcmFwcGVkTW9ja1JlYWx0aW1lVmlkZW9Tb3VyY2U+IG1fd3JhcHBlZFNvdXJjZTsKIH07
CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUK
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>374007</attachid>
            <date>2019-07-12 06:27:18 -0700</date>
            <delta_ts>2019-07-12 17:05:24 -0700</delta_ts>
            <desc>Patch for landing</desc>
            <filename>bug-194326-20190712092717.patch</filename>
            <type>text/plain</type>
            <size>10629</size>
            <attacher name="Thibault Saunier">tsaunier</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ3MzU5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjVmMTlmZTMxNjA3ZDRm
OTk5OWM0ZjcxYzIyN2YwYjQ3MGMwMDQyYy4uYWU2NmQ3NzEwMmE1YmM5ZTEyYTMwOTczNDk0OTFj
ZTQ1YWE2ZDQzYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM3IEBACisyMDE5LTA3LTExICBUaGli
YXVsdCBTYXVuaWVyICA8dHNhdW5pZXJAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1N0cmVhbWVy
XSBNb2NrIEdTdHJlYW1lciByZWFsdGltZSBzb3VyY2VzIHNob3VsZCBrZWVwIGEgUmVmIG9mIHRo
ZWlyIG1vY2sgcmVhbHRpbWUgbWVkaWEgc291cmNlcworICAgICAgICBodHRwczovL2J1Z3Mud2Vi
a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk0MzI2CisKKyAgICAgICAgV3JhcHBlZE1vY2tSZWFs
dGltZVZpZGVvU291cmNlIGlzIGEgc3ViY2xhc3Mgb2YgUmVhbHRpbWVNZWRpYVNvdXJjZSB3aGlj
aCBpcyByZWZjb3VudGVkLCB3ZSBjYW4ndAorICAgICAgICB1c2UgYSB1bmlxdWVfcHRyIG9uIHRo
b3NlLgorCisgICAgICAgIEFsc28gY2hhbmdlZCBtX3dyYXBwZWRTb3VyY2UgdHlwZSB0byBpdHMg
YWN0dWFsIHR5cGUgc28gaXQgaXMgY2xlYW5lciBldmVuIGlmIG5lZWRlZAorICAgICAgICB0byB1
cGNhc3QgaXQgdG8gUmVhbHRpbWVNZWRpYVNvdXJjZSBzbyBzb21lIG1ldGhvZCB0aGF0IGFyZSBt
YWRlIHByaXZhdGUgaW4gdGhlIG1vY2sKKyAgICAgICAgY2FuIHN0aWxsIGJlIGNhbGxlZC4KKwor
ICAgICAgICBSZXZpZXdlZCBieSBZb3Vlbm4gRmFibGV0LgorCisgICAgICAgIFRoaXMgZml4ZXMg
TWVkaWFTdHJlYW0gdGVzdHMKKworICAgICAgICAqIHBsYXRmb3JtL21lZGlhc3RyZWFtL2dzdHJl
YW1lci9Nb2NrR1N0cmVhbWVyQXVkaW9DYXB0dXJlU291cmNlLmNwcDoKKyAgICAgICAgKFdlYkNv
cmU6OldyYXBwZWRNb2NrUmVhbHRpbWVBdWRpb1NvdXJjZTo6Y3JlYXRlKToKKyAgICAgICAgKFdl
YkNvcmU6OldyYXBwZWRNb2NrUmVhbHRpbWVBdWRpb1NvdXJjZTo6YXNSZWFsdGltZU1lZGlhU291
cmNlKToKKyAgICAgICAgKFdlYkNvcmU6OldyYXBwZWRNb2NrUmVhbHRpbWVBdWRpb1NvdXJjZTo6
V3JhcHBlZE1vY2tSZWFsdGltZUF1ZGlvU291cmNlKToKKyAgICAgICAgKFdlYkNvcmU6Om1fd3Jh
cHBlZFNvdXJjZSk6CisgICAgICAgIChXZWJDb3JlOjpNb2NrR1N0cmVhbWVyQXVkaW9DYXB0dXJl
U291cmNlOjpzdGFydFByb2R1Y2luZ0RhdGEpOgorICAgICAgICAoV2ViQ29yZTo6TW9ja0dTdHJl
YW1lckF1ZGlvQ2FwdHVyZVNvdXJjZTo6c2V0dGluZ3MpOgorICAgICAgICAoV2ViQ29yZTo6TW9j
a0dTdHJlYW1lckF1ZGlvQ2FwdHVyZVNvdXJjZTo6Y2FwYWJpbGl0aWVzKToKKyAgICAgICAgKiBw
bGF0Zm9ybS9tZWRpYXN0cmVhbS9nc3RyZWFtZXIvTW9ja0dTdHJlYW1lckF1ZGlvQ2FwdHVyZVNv
dXJjZS5oOgorICAgICAgICAqIHBsYXRmb3JtL21lZGlhc3RyZWFtL2dzdHJlYW1lci9Nb2NrR1N0
cmVhbWVyVmlkZW9DYXB0dXJlU291cmNlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OldyYXBwZWRN
b2NrUmVhbHRpbWVWaWRlb1NvdXJjZTo6Y3JlYXRlKToKKyAgICAgICAgKFdlYkNvcmU6OldyYXBw
ZWRNb2NrUmVhbHRpbWVWaWRlb1NvdXJjZTo6YXNSZWFsdGltZU1lZGlhU291cmNlKToKKyAgICAg
ICAgKFdlYkNvcmU6OldyYXBwZWRNb2NrUmVhbHRpbWVWaWRlb1NvdXJjZTo6V3JhcHBlZE1vY2tS
ZWFsdGltZVZpZGVvU291cmNlKToKKyAgICAgICAgKFdlYkNvcmU6Om1fd3JhcHBlZFNvdXJjZSk6
CisgICAgICAgIChXZWJDb3JlOjpNb2NrR1N0cmVhbWVyVmlkZW9DYXB0dXJlU291cmNlOjpzZXR0
aW5ncyk6CisgICAgICAgIChXZWJDb3JlOjpNb2NrR1N0cmVhbWVyVmlkZW9DYXB0dXJlU291cmNl
OjpjYXBhYmlsaXRpZXMpOgorICAgICAgICAqIHBsYXRmb3JtL21lZGlhc3RyZWFtL2dzdHJlYW1l
ci9Nb2NrR1N0cmVhbWVyVmlkZW9DYXB0dXJlU291cmNlLmg6CisKIDIwMTktMDctMTEgIENocmlz
IER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBEaXNhYmxlIFJHQjEwIElPU3Vy
ZmFjZSBwaXhlbCBmb3JtYXQgZm9yIE1hYyBDYXRhbHlzdApkaWZmIC0tZ2l0IGEvU291cmNlL1dl
YkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vZ3N0cmVhbWVyL01vY2tHU3RyZWFtZXJBdWRpb0Nh
cHR1cmVTb3VyY2UuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vZ3N0
cmVhbWVyL01vY2tHU3RyZWFtZXJBdWRpb0NhcHR1cmVTb3VyY2UuY3BwCmluZGV4IDBmMWY3Mzli
MGNmNmZlMGE4MWUwNTA2Y2U1ODc5M2NkYTQ1NTZkMzIuLjQyY2I5YzZlOWQ3ZTI4Y2EzMGMzYWQ1
ODY4NGFiNDRjNTQ0NGFhMDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21l
ZGlhc3RyZWFtL2dzdHJlYW1lci9Nb2NrR1N0cmVhbWVyQXVkaW9DYXB0dXJlU291cmNlLmNwcAor
KysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9nc3RyZWFtZXIvTW9ja0dT
dHJlYW1lckF1ZGlvQ2FwdHVyZVNvdXJjZS5jcHAKQEAgLTQxLDEwICs0MSwxNCBAQCBzdGF0aWMg
Y29uc3QgZG91YmxlIHNfSHVtVm9sdW1lID0gMC4xOwogCiBjbGFzcyBXcmFwcGVkTW9ja1JlYWx0
aW1lQXVkaW9Tb3VyY2UgOiBwdWJsaWMgTW9ja1JlYWx0aW1lQXVkaW9Tb3VyY2UgewogcHVibGlj
OgotICAgIFdyYXBwZWRNb2NrUmVhbHRpbWVBdWRpb1NvdXJjZShTdHJpbmcmJiBkZXZpY2VJRCwg
U3RyaW5nJiYgbmFtZSwgU3RyaW5nJiYgaGFzaFNhbHQpCi0gICAgICAgIDogTW9ja1JlYWx0aW1l
QXVkaW9Tb3VyY2UoV1RGTW92ZShkZXZpY2VJRCksIFdURk1vdmUobmFtZSksIFdURk1vdmUoaGFz
aFNhbHQpKQotICAgICAgICAsIG1fc3JjKG51bGxwdHIpCisgICAgc3RhdGljIFJlZjxXcmFwcGVk
TW9ja1JlYWx0aW1lQXVkaW9Tb3VyY2U+IGNyZWF0ZShTdHJpbmcmJiBkZXZpY2VJRCwgU3RyaW5n
JiYgbmFtZSwgU3RyaW5nJiYgaGFzaFNhbHQpCisgICAgeworICAgICAgICByZXR1cm4gYWRvcHRS
ZWYoKm5ldyBXcmFwcGVkTW9ja1JlYWx0aW1lQXVkaW9Tb3VyY2UoV1RGTW92ZShkZXZpY2VJRCks
IFdURk1vdmUobmFtZSksIFdURk1vdmUoaGFzaFNhbHQpKSk7CisgICAgfQorCisgICAgUmVhbHRp
bWVNZWRpYVNvdXJjZSYgYXNSZWFsdGltZU1lZGlhU291cmNlKCkKICAgICB7CisgICAgICAgIHJl
dHVybiAqdGhpczsKICAgICB9CiAKICAgICB2b2lkIHN0YXJ0KEdSZWZQdHI8R3N0RWxlbWVudD4g
c3JjKQpAQCAtMTI4LDYgKzEzMiwxMiBAQCBwdWJsaWM6CiAgICAgdWludDMyX3QgbV9tYXhpbWl1
bUZyYW1lQ291bnQ7CiAgICAgdWludDY0X3QgbV9zYW1wbGVzRW1pdHRlZCB7IDAgfTsKICAgICB1
aW50NjRfdCBtX3NhbXBsZXNSZW5kZXJlZCB7IDAgfTsKKworcHJpdmF0ZToKKyAgICBXcmFwcGVk
TW9ja1JlYWx0aW1lQXVkaW9Tb3VyY2UoU3RyaW5nJiYgZGV2aWNlSUQsIFN0cmluZyYmIG5hbWUs
IFN0cmluZyYmIGhhc2hTYWx0KQorICAgICAgICA6IE1vY2tSZWFsdGltZUF1ZGlvU291cmNlKFdU
Rk1vdmUoZGV2aWNlSUQpLCBXVEZNb3ZlKG5hbWUpLCBXVEZNb3ZlKGhhc2hTYWx0KSkKKyAgICB7
CisgICAgfQogfTsKIAogQ2FwdHVyZVNvdXJjZU9yRXJyb3IgTW9ja1JlYWx0aW1lQXVkaW9Tb3Vy
Y2U6OmNyZWF0ZShTdHJpbmcmJiBkZXZpY2VJRCwKQEAgLTE1NCw3ICsxNjQsNyBAQCB2b2lkIE1v
Y2tHU3RyZWFtZXJBdWRpb0NhcHR1cmVTb3VyY2U6OmFwcGx5Q29uc3RyYWludHMoY29uc3QgTWVk
aWFDb25zdHJhaW50cyYgYwogCiBNb2NrR1N0cmVhbWVyQXVkaW9DYXB0dXJlU291cmNlOjpNb2Nr
R1N0cmVhbWVyQXVkaW9DYXB0dXJlU291cmNlKFN0cmluZyYmIGRldmljZUlELCBTdHJpbmcmJiBu
YW1lLCBTdHJpbmcmJiBoYXNoU2FsdCkKICAgICA6IEdTdHJlYW1lckF1ZGlvQ2FwdHVyZVNvdXJj
ZShTdHJpbmcgeyBkZXZpY2VJRCB9LCBTdHJpbmcgeyBuYW1lIH0sIFN0cmluZyB7IGhhc2hTYWx0
IH0pCi0gICAgLCBtX3dyYXBwZWRTb3VyY2Uoc3RkOjptYWtlX3VuaXF1ZTxXcmFwcGVkTW9ja1Jl
YWx0aW1lQXVkaW9Tb3VyY2U+KFdURk1vdmUoZGV2aWNlSUQpLCBXVEZNb3ZlKG5hbWUpLCBXVEZN
b3ZlKGhhc2hTYWx0KSkpCisgICAgLCBtX3dyYXBwZWRTb3VyY2UoV3JhcHBlZE1vY2tSZWFsdGlt
ZUF1ZGlvU291cmNlOjpjcmVhdGUoV1RGTW92ZShkZXZpY2VJRCksIFdURk1vdmUobmFtZSksIFdU
Rk1vdmUoaGFzaFNhbHQpKSkKIHsKICAgICBtX3dyYXBwZWRTb3VyY2UtPmFkZE9ic2VydmVyKCp0
aGlzKTsKIH0KQEAgLTE3NCwxOSArMTg0LDE5IEBAIHZvaWQgTW9ja0dTdHJlYW1lckF1ZGlvQ2Fw
dHVyZVNvdXJjZTo6c3RvcFByb2R1Y2luZ0RhdGEoKQogdm9pZCBNb2NrR1N0cmVhbWVyQXVkaW9D
YXB0dXJlU291cmNlOjpzdGFydFByb2R1Y2luZ0RhdGEoKQogewogICAgIEdTdHJlYW1lckF1ZGlv
Q2FwdHVyZVNvdXJjZTo6c3RhcnRQcm9kdWNpbmdEYXRhKCk7Ci0gICAgc3RhdGljX2Nhc3Q8V3Jh
cHBlZE1vY2tSZWFsdGltZUF1ZGlvU291cmNlKj4obV93cmFwcGVkU291cmNlLmdldCgpKS0+c3Rh
cnQoY2FwdHVyZXIoKS0+c291cmNlKCkpOworICAgIHN0YXRpY19jYXN0PFdyYXBwZWRNb2NrUmVh
bHRpbWVBdWRpb1NvdXJjZSY+KG1fd3JhcHBlZFNvdXJjZS5nZXQoKSkuc3RhcnQoY2FwdHVyZXIo
KS0+c291cmNlKCkpOwogfQogCiBjb25zdCBSZWFsdGltZU1lZGlhU291cmNlU2V0dGluZ3MmIE1v
Y2tHU3RyZWFtZXJBdWRpb0NhcHR1cmVTb3VyY2U6OnNldHRpbmdzKCkKIHsKLSAgICByZXR1cm4g
bV93cmFwcGVkU291cmNlLT5zZXR0aW5ncygpOworICAgIHJldHVybiBtX3dyYXBwZWRTb3VyY2Ut
PmFzUmVhbHRpbWVNZWRpYVNvdXJjZSgpLnNldHRpbmdzKCk7CiB9CiAKIGNvbnN0IFJlYWx0aW1l
TWVkaWFTb3VyY2VDYXBhYmlsaXRpZXMmIE1vY2tHU3RyZWFtZXJBdWRpb0NhcHR1cmVTb3VyY2U6
OmNhcGFiaWxpdGllcygpCiB7Ci0gICAgbV9jYXBhYmlsaXRpZXMgPSBtX3dyYXBwZWRTb3VyY2Ut
PmNhcGFiaWxpdGllcygpOwotICAgIG1fY3VycmVudFNldHRpbmdzID0gbV93cmFwcGVkU291cmNl
LT5zZXR0aW5ncygpOwotICAgIHJldHVybiBtX3dyYXBwZWRTb3VyY2UtPmNhcGFiaWxpdGllcygp
OworICAgIG1fY2FwYWJpbGl0aWVzID0gbV93cmFwcGVkU291cmNlLT5hc1JlYWx0aW1lTWVkaWFT
b3VyY2UoKS5jYXBhYmlsaXRpZXMoKTsKKyAgICBtX2N1cnJlbnRTZXR0aW5ncyA9IG1fd3JhcHBl
ZFNvdXJjZS0+YXNSZWFsdGltZU1lZGlhU291cmNlKCkuc2V0dGluZ3MoKTsKKyAgICByZXR1cm4g
bV93cmFwcGVkU291cmNlLT5hc1JlYWx0aW1lTWVkaWFTb3VyY2UoKS5jYXBhYmlsaXRpZXMoKTsK
IH0KIAogdm9pZCBNb2NrR1N0cmVhbWVyQXVkaW9DYXB0dXJlU291cmNlOjpjYXB0dXJlRmFpbGVk
KCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL2dzdHJl
YW1lci9Nb2NrR1N0cmVhbWVyQXVkaW9DYXB0dXJlU291cmNlLmggYi9Tb3VyY2UvV2ViQ29yZS9w
bGF0Zm9ybS9tZWRpYXN0cmVhbS9nc3RyZWFtZXIvTW9ja0dTdHJlYW1lckF1ZGlvQ2FwdHVyZVNv
dXJjZS5oCmluZGV4IGJkOTk5ZjlmYTY3ZmJkNGYzYmEzMzc3YzAxYmE4YTExYjY3MTQzOTkuLmUz
MDI1YzI1YTc2YTdjOTAxY2E1NjZmZTZjYTJiMTA3ZWJlOTdiODggMTAwNjQ0Ci0tLSBhL1NvdXJj
ZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL2dzdHJlYW1lci9Nb2NrR1N0cmVhbWVyQXVk
aW9DYXB0dXJlU291cmNlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJl
YW0vZ3N0cmVhbWVyL01vY2tHU3RyZWFtZXJBdWRpb0NhcHR1cmVTb3VyY2UuaApAQCAtMjcsNiAr
MjcsNyBAQAogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKK2NsYXNzIFdyYXBwZWRNb2NrUmVhbHRp
bWVBdWRpb1NvdXJjZTsKIGNsYXNzIE1vY2tHU3RyZWFtZXJBdWRpb0NhcHR1cmVTb3VyY2UgZmlu
YWwgOiBwdWJsaWMgR1N0cmVhbWVyQXVkaW9DYXB0dXJlU291cmNlLCBSZWFsdGltZU1lZGlhU291
cmNlOjpPYnNlcnZlciB7CiBwdWJsaWM6CiAgICAgTW9ja0dTdHJlYW1lckF1ZGlvQ2FwdHVyZVNv
dXJjZShTdHJpbmcmJiBkZXZpY2VJRCwgU3RyaW5nJiYgbmFtZSwgU3RyaW5nJiYgaGFzaFNhbHQp
OwpAQCAtMzksMTEgKzQwLDEwIEBAIHByaXZhdGU6CiAgICAgdm9pZCBzdGFydFByb2R1Y2luZ0Rh
dGEoKSBmaW5hbDsKICAgICBjb25zdCBSZWFsdGltZU1lZGlhU291cmNlU2V0dGluZ3MmIHNldHRp
bmdzKCkgZmluYWw7CiAgICAgY29uc3QgUmVhbHRpbWVNZWRpYVNvdXJjZUNhcGFiaWxpdGllcyYg
Y2FwYWJpbGl0aWVzKCkgZmluYWw7CisgICAgdm9pZCBjYXB0dXJlRmFpbGVkKCkgZmluYWw7Cisg
ICAgdm9pZCB2aWRlb1NhbXBsZUF2YWlsYWJsZShNZWRpYVNhbXBsZSYpIGZpbmFsIHsgfTsKIAot
ICAgIHZvaWQgY2FwdHVyZUZhaWxlZCgpOwotICAgIHN0ZDo6dW5pcXVlX3B0cjxSZWFsdGltZU1l
ZGlhU291cmNlPiBtX3dyYXBwZWRTb3VyY2U7Ci0KLSAgICB2b2lkIHZpZGVvU2FtcGxlQXZhaWxh
YmxlKE1lZGlhU2FtcGxlJikgb3ZlcnJpZGUgeyB9OworICAgIFJlZjxXcmFwcGVkTW9ja1JlYWx0
aW1lQXVkaW9Tb3VyY2U+IG1fd3JhcHBlZFNvdXJjZTsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdl
YkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL2dz
dHJlYW1lci9Nb2NrR1N0cmVhbWVyVmlkZW9DYXB0dXJlU291cmNlLmNwcCBiL1NvdXJjZS9XZWJD
b3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL2dzdHJlYW1lci9Nb2NrR1N0cmVhbWVyVmlkZW9DYXB0
dXJlU291cmNlLmNwcAppbmRleCAyYzcyZjViODc4NjdmYTFkZGRkYjcxNzUzNzBiMjczZWNiNGFi
NDQ2Li5hNDhmY2M4ZjZmNjQyZDY2ZjlmY2I4OTg4NWJhZGJlYmMyYzBjZjEzIDEwMDY0NAotLS0g
YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9nc3RyZWFtZXIvTW9ja0dTdHJl
YW1lclZpZGVvQ2FwdHVyZVNvdXJjZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v
bWVkaWFzdHJlYW0vZ3N0cmVhbWVyL01vY2tHU3RyZWFtZXJWaWRlb0NhcHR1cmVTb3VyY2UuY3Bw
CkBAIC0zMyw5ICszMywxNCBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIGNsYXNzIFdyYXBwZWRN
b2NrUmVhbHRpbWVWaWRlb1NvdXJjZSA6IHB1YmxpYyBNb2NrUmVhbHRpbWVWaWRlb1NvdXJjZSB7
CiBwdWJsaWM6Ci0gICAgV3JhcHBlZE1vY2tSZWFsdGltZVZpZGVvU291cmNlKFN0cmluZyYmIGRl
dmljZUlELCBTdHJpbmcmJiBuYW1lLCBTdHJpbmcmJiBoYXNoU2FsdCkKLSAgICAgICAgOiBNb2Nr
UmVhbHRpbWVWaWRlb1NvdXJjZShXVEZNb3ZlKGRldmljZUlEKSwgV1RGTW92ZShuYW1lKSwgV1RG
TW92ZShoYXNoU2FsdCkpCisgICAgc3RhdGljIFJlZjxXcmFwcGVkTW9ja1JlYWx0aW1lVmlkZW9T
b3VyY2U+IGNyZWF0ZShTdHJpbmcmJiBkZXZpY2VJRCwgU3RyaW5nJiYgbmFtZSwgU3RyaW5nJiYg
aGFzaFNhbHQpCisgICAgeworICAgICAgICByZXR1cm4gYWRvcHRSZWYoKm5ldyBXcmFwcGVkTW9j
a1JlYWx0aW1lVmlkZW9Tb3VyY2UoV1RGTW92ZShkZXZpY2VJRCksIFdURk1vdmUobmFtZSksIFdU
Rk1vdmUoaGFzaFNhbHQpKSk7CisgICAgfQorCisgICAgUmVhbHRpbWVNZWRpYVNvdXJjZSYgYXNS
ZWFsdGltZU1lZGlhU291cmNlKCkKICAgICB7CisgICAgICAgIHJldHVybiAqdGhpczsKICAgICB9
CiAKICAgICB2b2lkIHVwZGF0ZVNhbXBsZUJ1ZmZlcigpCkBAIC01OSw2ICs2NCwxMiBAQCBwdWJs
aWM6CiAKICAgICAgICAgdmlkZW9TYW1wbGVBdmFpbGFibGUoTWVkaWFTYW1wbGVHU3RyZWFtZXI6
OmNyZWF0ZShXVEZNb3ZlKGdzdFNhbXBsZSksIEZsb2F0U2l6ZSgpLCBTdHJpbmcoKSkpOwogICAg
IH0KKworcHJpdmF0ZToKKyAgICBXcmFwcGVkTW9ja1JlYWx0aW1lVmlkZW9Tb3VyY2UoU3RyaW5n
JiYgZGV2aWNlSUQsIFN0cmluZyYmIG5hbWUsIFN0cmluZyYmIGhhc2hTYWx0KQorICAgICAgICA6
IE1vY2tSZWFsdGltZVZpZGVvU291cmNlKFdURk1vdmUoZGV2aWNlSUQpLCBXVEZNb3ZlKG5hbWUp
LCBXVEZNb3ZlKGhhc2hTYWx0KSkKKyAgICB7CisgICAgfQogfTsKIAogQ2FwdHVyZVNvdXJjZU9y
RXJyb3IgTW9ja1JlYWx0aW1lVmlkZW9Tb3VyY2U6OmNyZWF0ZShTdHJpbmcmJiBkZXZpY2VJRCwK
QEAgLTk3LDcgKzEwOCw3IEBAIHZvaWQgTW9ja0dTdHJlYW1lclZpZGVvQ2FwdHVyZVNvdXJjZTo6
dmlkZW9TYW1wbGVBdmFpbGFibGUoTWVkaWFTYW1wbGUmIHNhbXBsZSkKIAogTW9ja0dTdHJlYW1l
clZpZGVvQ2FwdHVyZVNvdXJjZTo6TW9ja0dTdHJlYW1lclZpZGVvQ2FwdHVyZVNvdXJjZShTdHJp
bmcmJiBkZXZpY2VJRCwgU3RyaW5nJiYgbmFtZSwgU3RyaW5nJiYgaGFzaFNhbHQpCiAgICAgOiBH
U3RyZWFtZXJWaWRlb0NhcHR1cmVTb3VyY2UoU3RyaW5nIHsgZGV2aWNlSUQgfSwgU3RyaW5nIHsg
bmFtZSB9LCBTdHJpbmcgeyBoYXNoU2FsdCB9LCAiYXBwc3JjIikKLSAgICAsIG1fd3JhcHBlZFNv
dXJjZShzdGQ6Om1ha2VfdW5pcXVlPFdyYXBwZWRNb2NrUmVhbHRpbWVWaWRlb1NvdXJjZT4oV1RG
TW92ZShkZXZpY2VJRCksIFdURk1vdmUobmFtZSksIFdURk1vdmUoaGFzaFNhbHQpKSkKKyAgICAs
IG1fd3JhcHBlZFNvdXJjZShXcmFwcGVkTW9ja1JlYWx0aW1lVmlkZW9Tb3VyY2U6OmNyZWF0ZShX
VEZNb3ZlKGRldmljZUlEKSwgV1RGTW92ZShuYW1lKSwgV1RGTW92ZShoYXNoU2FsdCkpKQogewog
ICAgIG1fd3JhcHBlZFNvdXJjZS0+YWRkT2JzZXJ2ZXIoKnRoaXMpOwogfQpAQCAtMTIwLDEzICsx
MzEsMTMgQEAgdm9pZCBNb2NrR1N0cmVhbWVyVmlkZW9DYXB0dXJlU291cmNlOjphcHBseUNvbnN0
cmFpbnRzKGNvbnN0IE1lZGlhQ29uc3RyYWludHMmIGMKIAogY29uc3QgUmVhbHRpbWVNZWRpYVNv
dXJjZVNldHRpbmdzJiBNb2NrR1N0cmVhbWVyVmlkZW9DYXB0dXJlU291cmNlOjpzZXR0aW5ncygp
CiB7Ci0gICAgcmV0dXJuIG1fd3JhcHBlZFNvdXJjZS0+c2V0dGluZ3MoKTsKKyAgICByZXR1cm4g
bV93cmFwcGVkU291cmNlLT5hc1JlYWx0aW1lTWVkaWFTb3VyY2UoKS5zZXR0aW5ncygpOwogfQog
CiBjb25zdCBSZWFsdGltZU1lZGlhU291cmNlQ2FwYWJpbGl0aWVzJiBNb2NrR1N0cmVhbWVyVmlk
ZW9DYXB0dXJlU291cmNlOjpjYXBhYmlsaXRpZXMoKQogewotICAgIG1fY2FwYWJpbGl0aWVzID0g
bV93cmFwcGVkU291cmNlLT5jYXBhYmlsaXRpZXMoKTsKLSAgICBtX2N1cnJlbnRTZXR0aW5ncyA9
IG1fd3JhcHBlZFNvdXJjZS0+c2V0dGluZ3MoKTsKKyAgICBtX2NhcGFiaWxpdGllcyA9IG1fd3Jh
cHBlZFNvdXJjZS0+YXNSZWFsdGltZU1lZGlhU291cmNlKCkuY2FwYWJpbGl0aWVzKCk7CisgICAg
bV9jdXJyZW50U2V0dGluZ3MgPSBtX3dyYXBwZWRTb3VyY2UtPmFzUmVhbHRpbWVNZWRpYVNvdXJj
ZSgpLnNldHRpbmdzKCk7CiAgICAgcmV0dXJuIG1fY2FwYWJpbGl0aWVzLnZhbHVlKCk7CiB9CiAK
ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL2dzdHJlYW1l
ci9Nb2NrR1N0cmVhbWVyVmlkZW9DYXB0dXJlU291cmNlLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0
Zm9ybS9tZWRpYXN0cmVhbS9nc3RyZWFtZXIvTW9ja0dTdHJlYW1lclZpZGVvQ2FwdHVyZVNvdXJj
ZS5oCmluZGV4IDg5N2EzMWM2ZjhiNzkyYzkyNDVmOTE2YmU3ZmVjNjc3MTAzYmNhMjUuLmNiMTg0
NDVhZmFiNDE4MDY2NDdkM2JlMGU0NDg3MTE5NWYwMjhhYWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X
ZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL2dzdHJlYW1lci9Nb2NrR1N0cmVhbWVyVmlkZW9D
YXB0dXJlU291cmNlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0v
Z3N0cmVhbWVyL01vY2tHU3RyZWFtZXJWaWRlb0NhcHR1cmVTb3VyY2UuaApAQCAtNDMsMTEgKzQz
LDExIEBAIHByaXZhdGU6CiAgICAgdm9pZCBzdG9wUHJvZHVjaW5nRGF0YSgpIGZpbmFsOwogICAg
IHZvaWQgc3RhcnRQcm9kdWNpbmdEYXRhKCkgZmluYWw7CiAgICAgY29uc3QgUmVhbHRpbWVNZWRp
YVNvdXJjZVNldHRpbmdzJiBzZXR0aW5ncygpIGZpbmFsOwotICAgIHN0ZDo6dW5pcXVlX3B0cjxS
ZWFsdGltZU1lZGlhU291cmNlPiBtX3dyYXBwZWRTb3VyY2U7CiAgICAgY29uc3QgUmVhbHRpbWVN
ZWRpYVNvdXJjZUNhcGFiaWxpdGllcyYgY2FwYWJpbGl0aWVzKCkgZmluYWw7Ci0gICAgdm9pZCBj
YXB0dXJlRmFpbGVkKCkgb3ZlcnJpZGU7CisgICAgdm9pZCBjYXB0dXJlRmFpbGVkKCkgZmluYWw7
CisgICAgdm9pZCB2aWRlb1NhbXBsZUF2YWlsYWJsZShNZWRpYVNhbXBsZSYpIGZpbmFsOwogCi0g
ICAgdm9pZCB2aWRlb1NhbXBsZUF2YWlsYWJsZShNZWRpYVNhbXBsZSYpIG92ZXJyaWRlOworICAg
IFJlZjxXcmFwcGVkTW9ja1JlYWx0aW1lVmlkZW9Tb3VyY2U+IG1fd3JhcHBlZFNvdXJjZTsKIH07
CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUK
</data>

          </attachment>
      

    </bug>

</bugzilla>