Merge commit '574d7eb241a60622b0573ab1460cb23d968ba1cc' into thread-next

diff --cc nest/locks.c
Simple merge

diff --cc nest/locks.h
Simple merge

diff --cc proto/bgp/bgp.c
index 1c9844387443a1c2b24100499a4fd04b5f4d46ff,e97b45e6fea3b6f2c23a15d360630ec24eca4f40..1c9c38590872831367e85fb758563ba80df72c07
--- 1/proto/bgp/bgp.c
--- 2/proto/bgp/bgp.c
+++ b/proto/bgp/bgp.c
@@@ -1819,8 -1614,9 +1819,9 @@@ bgp_start(struct proto *P
     * so that we are the only instance attempting to talk with that neighbor.
     */
    struct object_lock *lock;
 -  lock = p->lock = olock_new(P->pool);
 +  lock = p->lock = olock_new(P->pool_inloop);
    lock->addr = p->remote_ip;
+   lock->addr_local = p->cf->local_ip;
    lock->port = p->cf->remote_port;
    lock->iface = p->cf->iface;
    lock->vrf = p->cf->iface ? NULL : p->p.vrf;

diff --cc proto/bgp/packets.c
Simple merge