diff -Nru procps-3.3.16/debian/changelog procps-3.3.16/debian/changelog
--- procps-3.3.16/debian/changelog	2020-07-22 23:59:38.000000000 -0500
+++ procps-3.3.16/debian/changelog	2020-11-06 12:18:04.000000000 -0600
@@ -1,3 +1,12 @@
+procps (2:3.3.16-5ubuntu3) groovy; urgency=medium
+
+  * d/p/ignore_eaccess.patch
+    - Fix conflict with 7af88da3 and adjust logic (LP: #1903351)
+  * d/p/ignore_erofs.patch
+    - Fix conflict with 7af88da3 and adjust logic (LP: #1903351)
+
+ -- Vincent Fazio <vfazio@xes-inc.com>  Fri, 06 Nov 2020 12:18:04 -0600
+
 procps (2:3.3.16-5ubuntu2) groovy; urgency=medium
 
   * debian/sysctl.d/10-kernel-hardening.conf:
diff -Nru procps-3.3.16/debian/patches/ignore_eaccess.patch procps-3.3.16/debian/patches/ignore_eaccess.patch
--- procps-3.3.16/debian/patches/ignore_eaccess.patch	2020-02-14 00:53:02.000000000 -0600
+++ procps-3.3.16/debian/patches/ignore_eaccess.patch	2020-11-06 12:18:04.000000000 -0600
@@ -1,19 +1,18 @@
 Description: Ignore EACCESS when writing a new setting
  If we are running in a container, we're not allowed to write to any
  non-namespaced sysctls.
-Author: Serge Hallyn <serge.hallyn@ubuntu.com>
+Author: Vincent Fazio <vfazio@xes-inc.com>
 Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/procps/+bug/1157643
 
-Index: procps-3.3.16-1ubuntu1/sysctl.c
+Index: procps-3.3.16/sysctl.c
 ===================================================================
---- procps-3.3.16-1ubuntu1.orig/sysctl.c
-+++ procps-3.3.16-1ubuntu1/sysctl.c
-@@ -236,7 +236,7 @@
- 			break;
+--- procps-3.3.16.orig/sysctl.c
++++ procps-3.3.16/sysctl.c
+@@ -459,6 +459,7 @@ static int WriteSetting(const char *sett
+ 		case EPERM:
+ 		case EROFS:
  		case EACCES:
- 			xwarnx(_("permission denied on key '%s'"), outname);
--			rc = -1;
-+			rc = 0;
++			ignore_failure = true;
+ 			xwarnx(_("permission denied on key \"%s\"%s"), outname, (ignore_failure?_(", ignoring"):""));
  			break;
- 		case EIO:	    /* Ignore stable_secret below /proc/sys/net/ipv6/conf */
- 			rc = -1;
+ 		default:
diff -Nru procps-3.3.16/debian/patches/ignore_erofs.patch procps-3.3.16/debian/patches/ignore_erofs.patch
--- procps-3.3.16/debian/patches/ignore_erofs.patch	2020-02-14 00:53:02.000000000 -0600
+++ procps-3.3.16/debian/patches/ignore_erofs.patch	2020-11-06 12:18:04.000000000 -0600
@@ -1,18 +1,27 @@
-Index: procps-3.3.16-1ubuntu1/sysctl.c
+Description: Ignore EROFS when writing a new setting
+ If we are running in a container, we're not allowed to write to any
+ non-namespaced sysctls.
+Author: Vincent Fazio <vfazio@xes-inc.com>
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/procps/+bug/1419554
+Last-Update: 2020-11-06
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: procps-3.3.16/sysctl.c
 ===================================================================
---- procps-3.3.16-1ubuntu1.orig/sysctl.c
-+++ procps-3.3.16-1ubuntu1/sysctl.c
-@@ -457,10 +457,13 @@
+--- procps-3.3.16.orig/sysctl.c
++++ procps-3.3.16/sysctl.c
+@@ -457,11 +457,14 @@ static int WriteSetting(const char *sett
  			}
  			break;
  		case EPERM:
 -		case EROFS:
  		case EACCES:
+ 			ignore_failure = true;
  			xwarnx(_("permission denied on key \"%s\"%s"), outname, (ignore_failure?_(", ignoring"):""));
  			break;
 +		case EROFS:
-+			xwarn(_("setting key \"%s\""), outname);
-+			rc = 0;
++			ignore_failure = true;
++			xwarn(_("setting key \"%s\"%s"), outname, (ignore_failure?_(", ignoring"):""));
 +			break;
  		default:
  			xwarn(_("setting key \"%s\"%s"), outname, (ignore_failure?_(", ignoring"):""));