The following commit has been merged in the master branch: commit 6f5b92a79c4aa1a7cd2e985ccbd5c40aaa77bd73 Author: Randy Dunlap rdunlap@infradead.org Date: Sun Jul 19 11:08:11 2020 -0700

batman-adv: types.h: delete duplicated words

Delete the doubled word "time" in a comment. Delete the doubled word "address" in a comment.

Signed-off-by: Randy Dunlap rdunlap@infradead.org Signed-off-by: Sven Eckelmann sven@narfation.org Signed-off-by: Simon Wunderlich sw@simonwunderlich.de

diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h index ed519efa3c36..965336a3b89d 100644 --- a/net/batman-adv/types.h +++ b/net/batman-adv/types.h @@ -1492,7 +1492,7 @@ struct batadv_tp_vars { /** @unacked_lock: protect unacked_list */ spinlock_t unacked_lock;

- /** @last_recv_time: time time (jiffies) a msg was received */ + /** @last_recv_time: time (jiffies) a msg was received */ unsigned long last_recv_time;

/** @refcount: number of context where the object is used */ @@ -1996,7 +1996,7 @@ struct batadv_tt_change_node { */ struct batadv_tt_req_node { /** - * @addr: mac address address of the originator this request was sent to + * @addr: mac address of the originator this request was sent to */ u8 addr[ETH_ALEN];