Landings for Stack Containing D139817

Failed to land

Landing requested on , by alissy@mozilla.com.

Revisions: D139816 diff 561112 D140742 diff 561113 D140744 diff 561114 D141109 diff 561115 D139817 diff 561116

While applying revision D139816 to mozilla-central, the following files had conflicts:

(Hint: try rebasing your changes on the latest commits from mozilla-central and re-submitting.)

  • ipc/glue/UtilityProcessManager.cpp @ 8cd7e7e91bc41488f191cf6f2249594efe9187dc
  • --- UtilityProcessManager.cpp
    +++ UtilityProcessManager.cpp
    ...
    
    --- UtilityProcessManager.cpp
    +++ UtilityProcessManager.cpp
    @@ -264,11 +248,11 @@
         if (!parent) {
           return false;
         }
     
         return parent->SendRequestMemoryReport(aGeneration, aAnonymize,
    -                                          aMinimizeMemoryUsage, aDMDFile);
    +                                           aMinimizeMemoryUsage, aDMDFile);
       }
     
       int32_t Pid() const override {
         if (UtilityProcessParent* parent = GetParent()) {
           return (int32_t)parent->OtherPid();
    
Raw error output:
Problem while applying patch in revision 139816:

hg error in cmd: hg import --no-commit -s 95 /tmp/tmpjxmdbbi8: applying /tmp/tmpjxmdbbi8

patching file ipc/glue/UtilityProcessManager.cpp
Hunk #2 FAILED at 247
1 out of 2 hunks FAILED -- saving rejects to file ipc/glue/UtilityProcessManager.cpp.rej
abort: patch failed to apply
Failed to land

Landing requested on , by alissy@mozilla.com.

Revisions: D139816 diff 561107 D140742 diff 561108 D140744 diff 561109 D141109 diff 561110 D139817 diff 561111

While applying revision D139816 to mozilla-central, the following files had conflicts:

(Hint: try rebasing your changes on the latest commits from mozilla-central and re-submitting.)

  • ipc/glue/UtilityProcessManager.cpp @ 8cd7e7e91bc41488f191cf6f2249594efe9187dc
  • --- UtilityProcessManager.cpp
    +++ UtilityProcessManager.cpp
    ...
    
    --- UtilityProcessManager.cpp
    +++ UtilityProcessManager.cpp
    @@ -264,11 +248,11 @@
         if (!parent) {
           return false;
         }
     
         return parent->SendRequestMemoryReport(aGeneration, aAnonymize,
    -                                          aMinimizeMemoryUsage, aDMDFile);
    +                                           aMinimizeMemoryUsage, aDMDFile);
       }
     
       int32_t Pid() const override {
         if (UtilityProcessParent* parent = GetParent()) {
           return (int32_t)parent->OtherPid();
    
Raw error output:
Problem while applying patch in revision 139816:

hg error in cmd: hg import --no-commit -s 95 /tmp/tmpctrgmrpt: applying /tmp/tmpctrgmrpt

patching file ipc/glue/UtilityProcessManager.cpp
Hunk #2 FAILED at 247
1 out of 2 hunks FAILED -- saving rejects to file ipc/glue/UtilityProcessManager.cpp.rej
abort: patch failed to apply
Successfully landed

Stack containing revision D139817

Land Bug Status Revision Reviewers
1753424
Blocked
Repository is not supported by Lando.
Closed
D139817: Bug 1753424 - Support running multiple UtilityProcess r?nika!
  • @nika accepted a prior diff
1753424
Blocked
Repository is not supported by Lando.
Closed
D141109: Bug 1753424 - Ensure UtilityProcessChild singleton is mutex-protected r?nika!
  • @nika accepted a prior diff
1753424
Blocked
Repository is not supported by Lando.
Closed
D140744: Bug 1753424 - Update SandboxTest code with sandboxingKind r?jld!
  • @jld accepted a prior diff
1753424
Blocked
Repository is not supported by Lando.
Closed
D140742: Bug 1753424 - Add SandboxingKind for UtilityProcess crash annotations r?gsvelto!
  • @gsvelto accepted a prior diff
1753424
Blocked
Repository is not supported by Lando.
Closed
D139816: Bug 1753424 - Remove unused UtilityProcessParent and UtilityProcessManager code r?nika!
  • @nika accepted a prior diff
1758715
Blocked
Repository is not supported by Lando.
Closed
D139966: Bug 1758715 - Dont always instantiate a UtilityProcessManager from FOG r?gerald!
  • @gerald accepted a prior diff