resolving conflict on series file based on recent commit

vharish02 · Sep 16, 2019 · b8f83ab · b8f83ab
1 parent a71090a
commit b8f83ab
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 28 deletions.
diff --git a/src/snmpd/patch-5.7.3+dfsg/0006-Release-all-requests-that-use-this-session.patch b/src/snmpd/patch-5.7.3+dfsg/0006-Release-all-requests-that-use-this-session.patch
diff --git a/src/snmpd/patch-5.7.3+dfsg/0007-Linux-VRF-5.7.3-Support.patch b/src/snmpd/patch-5.7.3+dfsg/0007-Linux-VRF-5.7.3-Support.patch
@@ -1,7 +1,7 @@
 From 49ce7fc078dfa8c1a1688e05de4e2d151dbcd76a Mon Sep 17 00:00:00 2001
 From: Harish Venkatraman <[email protected]>
 Date: Wed, 17 Oct 2018 15:22:04 -0700
-Subject: [PATCH] Linux-VRF 5.7.3 Support
+Subject: [PATCH] Linux-VRF 5.7.3 Support from https://sourceforge.net/p/net-snmp/patches/1376/
 
 ---
  agent/agent_trap.c                               | 20 ++++++++++--

diff --git a/src/snmpd/patch-5.7.3+dfsg/series b/src/snmpd/patch-5.7.3+dfsg/series
@@ -3,5 +3,5 @@
 0003-CHANGES-BUG-2743-snmpd-crashes-when-receiving-a-GetN.patch
 0004-Disable-SNMPv1.patch
 0005-Port-OpenSSL-1.1.0-with-support-for-1.0.2.patch
-0006-Release-all-requests-that-use-this-session.patch
+0006-From-Jiri-Cervenka-snmpd-Fixed-agentx-crashing-and-or-freezing-on-timeout.patch
 0007-Linux-VRF-5.7.3-Support.patch