[PATCH 05/10] libctf: remove reference to "unconflicted link mode".

[Nick Alcock]

There is no such thing, and the comment makes no sense, and doesn't
match what the code is doing.  We always want to put variables in the
same dicts as the types they relate to if at all possible.

libctf/ChangeLog
2021-02-23  Nick Alcock  <nick.alcock@oracle.com>

	* ctf-link.c (ctf_link_one_variable): Remove reference to
	"unconflicted link mode".
---
 libctf/ChangeLog  | 5 +++++
 libctf/ctf-link.c | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/libctf/ChangeLog b/libctf/ChangeLog
index 0f84eea9533..04955011f93 100644
--- a/libctf/ChangeLog
+++ b/libctf/ChangeLog
@@ -1,3 +1,8 @@
+2021-02-23  Nick Alcock  <nick.alcock@oracle.com>
+
+	* ctf-link.c (ctf_link_one_variable): Remove reference to
+	"unconflicted link mode".
+
 2021-02-23  Nick Alcock  <nick.alcock@oracle.com>
 
 	* ctf-link.c (ctf_create_per_cu): Drop FILENAME now that it is
diff --git a/libctf/ctf-link.c b/libctf/ctf-link.c
index 5d813dbf8b3..d598b7848e8 100644
--- a/libctf/ctf-link.c
+++ b/libctf/ctf-link.c
@@ -499,9 +499,9 @@ ctf_link_one_variable (const char *name, ctf_id_t type, void *arg_)
 	return 0;
     }
 
-  /* In unconflicted link mode, if this type is mapped to a type in the parent
-     dict, we want to try to add to that first: if it reports a duplicate,
-     or if the type is in a child already, add straight to the child.  */
+  /* If this type is mapped to a type in the parent dict, we want to try to add
+     to that first: if it reports a duplicate, or if the type is in a child
+     already, add straight to the child.  */
 
   insert_fp = arg->out_fp;
 
-- 
2.30.0.252.gc27e85e57d