summaryrefslogtreecommitdiffhomepage
path: root/pkg/tcpip
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2021-02-12 00:07:09 +0000
committergVisor bot <gvisor-bot@google.com>2021-02-12 00:07:09 +0000
commit2cb6129a78c570821ab7ecee012ba8862dfa7e96 (patch)
tree7084d1ba860f45bffe96451208b83c7450ae945d /pkg/tcpip
parentdf399e224e510350132497e6a96968c64251ba7c (diff)
parentc39284f457383dabd52f468a10072ca6d2211cbb (diff)
Merge release-20210201.0-89-gc39284f45 (automated)
Diffstat (limited to 'pkg/tcpip')
-rw-r--r--pkg/tcpip/errors.go4
1 files changed, 4 insertions, 0 deletions
diff --git a/pkg/tcpip/errors.go b/pkg/tcpip/errors.go
index af46da1d2..3b7cc52f3 100644
--- a/pkg/tcpip/errors.go
+++ b/pkg/tcpip/errors.go
@@ -32,6 +32,8 @@ type Error interface {
fmt.Stringer
}
+// LINT.IfChange
+
// ErrAborted indicates the operation was aborted.
//
// +stateify savable
@@ -536,3 +538,5 @@ func (*ErrWouldBlock) IgnoreStats() bool {
return true
}
func (*ErrWouldBlock) String() string { return "operation would block" }
+
+// LINT.ThenChange(../syserr/netstack.go)