diff options
| author |   Thomas Zimmermann <tzimmermann@suse.de> | 2024-03-25 21:11:58 +0100 |
|---|---|---|
| committer | Thomas Zimmermann <tzimmermann@suse.de> | 2024-03-25 21:11:58 +0100 |
| commit | 36a1818f5a1e50b805317ba13f827067d50f6970 (patch) | |
| tree | b9414b9509bea9f006c292a46a7632ffb57d18ee /net/tipc/socket.c | |
| parent | dma-buf: Fix NULL pointer dereference in sanitycheck() (diff) | |
| parent | Linux 6.9-rc1 (diff) | |
| download | wireguard-linux-36a1818f5a1e50b805317ba13f827067d50f6970.tar.xz wireguard-linux-36a1818f5a1e50b805317ba13f827067d50f6970.zip | |
Merge drm/drm-fixes into drm-misc-fixes
Backmerging to get drm-misc-fixes to the state of v6.9-rc1.
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Diffstat (limited to '')
| -rw-r--r-- | net/tipc/socket.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/tipc/socket.c b/net/tipc/socket.c index bb1118d02f95..7e4135db5816 100644 --- a/net/tipc/socket.c +++ b/net/tipc/socket.c @@ -80,7 +80,6 @@ struct sockaddr_pair { * @phdr: preformatted message header used when sending messages * @cong_links: list of congested links * @publications: list of publications for port - * @blocking_link: address of the congested link we are currently sleeping on * @pub_count: total # of publications port has made during its lifetime * @conn_timeout: the time we can wait for an unresponded setup request * @probe_unacked: probe has not received ack yet |