all: fix up context import after go fix

28 files changed, 28 insertions, 29 deletions

diff --git a/dashboard/app/access.go b/dashboard/app/access.go
index b63eb9294..912f0e6cf 100644
--- a/dashboard/app/access.go
+++ b/dashboard/app/access.go
@@ -4,12 +4,12 @@
 package main
 
 import (
+	"context"
 	"errors"
 	"fmt"
 	"net/http"
 	"strings"
 
-	"context"
 	db "google.golang.org/appengine/v2/datastore"
 	"google.golang.org/appengine/v2/log"
 	"google.golang.org/appengine/v2/user"
diff --git a/dashboard/app/access_test.go b/dashboard/app/access_test.go
index 3fb305f76..08a759892 100644
--- a/dashboard/app/access_test.go
+++ b/dashboard/app/access_test.go
@@ -5,13 +5,13 @@ package main
 
 import (
 	"bytes"
+	"context"
 	"errors"
 	"fmt"
 	"net/http"
 	"strconv"
 	"testing"
 
-	"context"
 	"github.com/google/syzkaller/dashboard/dashapi"
 	"google.golang.org/appengine/v2/user"
 )
diff --git a/dashboard/app/admin.go b/dashboard/app/admin.go
index af349c061..04df13ea2 100644
--- a/dashboard/app/admin.go
+++ b/dashboard/app/admin.go
@@ -4,11 +4,11 @@
 package main
 
 import (
+	"context"
 	"fmt"
 	"net/http"
 	"time"
 
-	"context"
 	"github.com/google/syzkaller/dashboard/dashapi"
 	db "google.golang.org/appengine/v2/datastore"
 	"google.golang.org/appengine/v2/log"
diff --git a/dashboard/app/api.go b/dashboard/app/api.go
index 64db7aa28..973096629 100644
--- a/dashboard/app/api.go
+++ b/dashboard/app/api.go
@@ -6,6 +6,7 @@ package main
 import (
 	"bytes"
 	"compress/gzip"
+	"context"
 	"encoding/json"
 	"fmt"
 	"io"
@@ -19,7 +20,6 @@ import (
 	"time"
 	"unicode/utf8"
 
-	"context"
 	"github.com/google/syzkaller/dashboard/dashapi"
 	"github.com/google/syzkaller/pkg/asset"
 	"github.com/google/syzkaller/pkg/auth"
diff --git a/dashboard/app/asset_storage.go b/dashboard/app/asset_storage.go
index 016975e6f..199a44733 100644
--- a/dashboard/app/asset_storage.go
+++ b/dashboard/app/asset_storage.go
@@ -4,13 +4,13 @@
 package main
 
 import (
+	"context"
 	"errors"
 	"fmt"
 	"net/http"
 	"sort"
 	"time"
 
-	"context"
 	"github.com/google/syzkaller/dashboard/dashapi"
 	"github.com/google/syzkaller/pkg/asset"
 	"github.com/google/syzkaller/sys/targets"
diff --git a/dashboard/app/cache.go b/dashboard/app/cache.go
index 58322c703..b662657fa 100644
--- a/dashboard/app/cache.go
+++ b/dashboard/app/cache.go
@@ -4,6 +4,7 @@
 package main
 
 import (
+	"context"
 	"encoding/json"
 	"errors"
 	"fmt"
@@ -11,7 +12,6 @@ import (
 	"sort"
 	"time"
 
-	"context"
 	"github.com/google/syzkaller/pkg/hash"
 	"github.com/google/syzkaller/pkg/image"
 	"google.golang.org/appengine/v2"
diff --git a/dashboard/app/config.go b/dashboard/app/config.go
index d0b01ff24..6a4a3d530 100644
--- a/dashboard/app/config.go
+++ b/dashboard/app/config.go
@@ -5,13 +5,13 @@ package main
 
 import (
 	"bytes"
+	"context"
 	"encoding/json"
 	"fmt"
 	"net/mail"
 	"regexp"
 	"time"
 
-	"context"
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/syzkaller/dashboard/dashapi"
 	"github.com/google/syzkaller/pkg/auth"
diff --git a/dashboard/app/discussion.go b/dashboard/app/discussion.go
index bb9857bec..5a234795a 100644
--- a/dashboard/app/discussion.go
+++ b/dashboard/app/discussion.go
@@ -4,11 +4,11 @@
 package main
 
 import (
+	"context"
 	"fmt"
 	"sort"
 	"strings"
 
-	"context"
 	"github.com/google/syzkaller/dashboard/dashapi"
 	"github.com/google/syzkaller/pkg/email"
 	db "google.golang.org/appengine/v2/datastore"
diff --git a/dashboard/app/email_test.go b/dashboard/app/email_test.go
index 8926774ad..0e82ee142 100644
--- a/dashboard/app/email_test.go
+++ b/dashboard/app/email_test.go
@@ -4,12 +4,12 @@
 package main
 
 import (
+	"context"
 	"fmt"
 	"strings"
 	"testing"
 	"time"
 
-	"context"
 	"github.com/google/syzkaller/dashboard/dashapi"
 	"github.com/google/syzkaller/pkg/email"
 	"github.com/google/syzkaller/sys/targets"
diff --git a/dashboard/app/entities.go b/dashboard/app/entities.go
index 645d792c5..0eb4f4df6 100644
--- a/dashboard/app/entities.go
+++ b/dashboard/app/entities.go
@@ -4,13 +4,13 @@
 package main
 
 import (
+	"context"
 	"fmt"
 	"regexp"
 	"strconv"
 	"strings"
 	"time"
 
-	"context"
 	"github.com/google/syzkaller/dashboard/dashapi"
 	"github.com/google/syzkaller/pkg/hash"
 	"github.com/google/syzkaller/pkg/subsystem"
diff --git a/dashboard/app/graphs.go b/dashboard/app/graphs.go
index af453f474..6f0ad854b 100644
--- a/dashboard/app/graphs.go
+++ b/dashboard/app/graphs.go
@@ -4,6 +4,7 @@
 package main
 
 import (
+	"context"
 	"fmt"
 	"net/http"
 	"net/url"
@@ -12,7 +13,6 @@ import (
 	"strconv"
 	"time"
 
-	"context"
 	db "google.golang.org/appengine/v2/datastore"
 )
 
diff --git a/dashboard/app/handler.go b/dashboard/app/handler.go
index 5b2337a30..d6f9b6861 100644
--- a/dashboard/app/handler.go
+++ b/dashboard/app/handler.go
@@ -5,6 +5,7 @@ package main
 
 import (
 	"bytes"
+	"context"
 	"encoding/base64"
 	"encoding/json"
 	"errors"
@@ -14,7 +15,6 @@ import (
 	"strings"
 	"time"
 
-	"context"
 	"github.com/google/syzkaller/pkg/html"
 	"google.golang.org/appengine/v2"
 	"google.golang.org/appengine/v2/log"
diff --git a/dashboard/app/jobs.go b/dashboard/app/jobs.go
index 8898265e3..0c3c986bf 100644
--- a/dashboard/app/jobs.go
+++ b/dashboard/app/jobs.go
@@ -4,6 +4,7 @@
 package main
 
 import (
+	"context"
 	"encoding/json"
 	"fmt"
 	"math/rand"
@@ -12,7 +13,6 @@ import (
 	"strings"
 	"time"
 
-	"context"
 	"github.com/google/syzkaller/dashboard/dashapi"
 	"github.com/google/syzkaller/pkg/email"
 	"github.com/google/syzkaller/pkg/vcs"
diff --git a/dashboard/app/kcidb.go b/dashboard/app/kcidb.go
index badff6513..0a1ef9705 100644
--- a/dashboard/app/kcidb.go
+++ b/dashboard/app/kcidb.go
@@ -4,11 +4,11 @@
 package main
 
 import (
+	"context"
 	"fmt"
 	"net/http"
 	"time"
 
-	"context"
 	"github.com/google/syzkaller/pkg/kcidb"
 	"google.golang.org/appengine/v2"
 	db "google.golang.org/appengine/v2/datastore"
diff --git a/dashboard/app/label.go b/dashboard/app/label.go
index bd5bb21fa..cbff8c33e 100644
--- a/dashboard/app/label.go
+++ b/dashboard/app/label.go
@@ -4,11 +4,10 @@
 package main
 
 import (
+	"context"
 	"fmt"
 	"sort"
 	"strings"
-
-	"context"
 )
 
 const (
diff --git a/dashboard/app/main.go b/dashboard/app/main.go
index fdf86fb86..a95bb7fad 100644
--- a/dashboard/app/main.go
+++ b/dashboard/app/main.go
@@ -5,6 +5,7 @@ package main
 
 import (
 	"bytes"
+	"context"
 	"encoding/json"
 	"fmt"
 	"html/template"
@@ -19,7 +20,6 @@ import (
 
 	"cloud.google.com/go/logging"
 	"cloud.google.com/go/logging/logadmin"
-	"context"
 	"github.com/google/syzkaller/dashboard/dashapi"
 	"github.com/google/syzkaller/pkg/debugtracer"
 	"github.com/google/syzkaller/pkg/email"
diff --git a/dashboard/app/main_test.go b/dashboard/app/main_test.go
index 5444f2e75..f8d35ff56 100644
--- a/dashboard/app/main_test.go
+++ b/dashboard/app/main_test.go
@@ -5,12 +5,12 @@ package main
 
 import (
 	"bytes"
+	"context"
 	"errors"
 	"net/http"
 	"testing"
 	"time"
 
-	"context"
 	"github.com/google/syzkaller/dashboard/dashapi"
 	"github.com/stretchr/testify/assert"
 )
diff --git a/dashboard/app/notifications_test.go b/dashboard/app/notifications_test.go
index 9ae20b770..ec048a844 100644
--- a/dashboard/app/notifications_test.go
+++ b/dashboard/app/notifications_test.go
@@ -4,12 +4,12 @@
 package main
 
 import (
+	"context"
 	"fmt"
 	"strings"
 	"testing"
 	"time"
 
-	"context"
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/syzkaller/dashboard/dashapi"
 	"github.com/google/syzkaller/pkg/email"
diff --git a/dashboard/app/reporting.go b/dashboard/app/reporting.go
index 51cffc13f..5e9583da3 100644
--- a/dashboard/app/reporting.go
+++ b/dashboard/app/reporting.go
@@ -5,6 +5,7 @@ package main
 
 import (
 	"bytes"
+	"context"
 	"encoding/json"
 	"fmt"
 	"math"
@@ -13,7 +14,6 @@ import (
 	"strings"
 	"time"
 
-	"context"
 	"github.com/google/syzkaller/dashboard/dashapi"
 	"github.com/google/syzkaller/pkg/email"
 	"github.com/google/syzkaller/pkg/html"
diff --git a/dashboard/app/reporting_email.go b/dashboard/app/reporting_email.go
index d68b2c0ae..635af8cd2 100644
--- a/dashboard/app/reporting_email.go
+++ b/dashboard/app/reporting_email.go
@@ -5,6 +5,7 @@ package main
 
 import (
 	"bytes"
+	"context"
 	"encoding/json"
 	"errors"
 	"fmt"
@@ -19,7 +20,6 @@ import (
 	"text/tabwriter"
 	"time"
 
-	"context"
 	"github.com/google/syzkaller/dashboard/dashapi"
 	"github.com/google/syzkaller/pkg/email"
 	"github.com/google/syzkaller/pkg/email/lore"
diff --git a/dashboard/app/reporting_external.go b/dashboard/app/reporting_external.go
index 1336cbc1c..abeaedd0b 100644
--- a/dashboard/app/reporting_external.go
+++ b/dashboard/app/reporting_external.go
@@ -4,12 +4,12 @@
 package main
 
 import (
+	"context"
 	"encoding/json"
 	"errors"
 	"fmt"
 	"net/http"
 
-	"context"
 	"github.com/google/syzkaller/dashboard/dashapi"
 	"google.golang.org/appengine/v2/log"
 )
diff --git a/dashboard/app/reporting_lists.go b/dashboard/app/reporting_lists.go
index 5dd3b8693..64fdfa363 100644
--- a/dashboard/app/reporting_lists.go
+++ b/dashboard/app/reporting_lists.go
@@ -4,6 +4,7 @@
 package main
 
 import (
+	"context"
 	"encoding/json"
 	"fmt"
 	"net/http"
@@ -11,7 +12,6 @@ import (
 	"strings"
 	"time"
 
-	"context"
 	"github.com/google/syzkaller/dashboard/dashapi"
 	"github.com/google/syzkaller/pkg/hash"
 	"google.golang.org/appengine/v2"
diff --git a/dashboard/app/reporting_test.go b/dashboard/app/reporting_test.go
index c9ad1c8c2..e6d020786 100644
--- a/dashboard/app/reporting_test.go
+++ b/dashboard/app/reporting_test.go
@@ -4,6 +4,7 @@
 package main
 
 import (
+	"context"
 	"fmt"
 	"html"
 	"reflect"
@@ -11,7 +12,6 @@ import (
 	"testing"
 	"time"
 
-	"context"
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/syzkaller/dashboard/dashapi"
 	"github.com/google/syzkaller/pkg/email"
diff --git a/dashboard/app/stats.go b/dashboard/app/stats.go
index decbe6bc7..d8123933e 100644
--- a/dashboard/app/stats.go
+++ b/dashboard/app/stats.go
@@ -4,11 +4,11 @@
 package main
 
 import (
+	"context"
 	"errors"
 	"fmt"
 	"time"
 
-	"context"
 	"github.com/google/syzkaller/dashboard/dashapi"
 	"github.com/google/syzkaller/pkg/stats/syzbotstats"
 	"google.golang.org/appengine/v2"
diff --git a/dashboard/app/subsystem.go b/dashboard/app/subsystem.go
index 07d52dcd5..293f67481 100644
--- a/dashboard/app/subsystem.go
+++ b/dashboard/app/subsystem.go
@@ -4,12 +4,12 @@
 package main
 
 import (
+	"context"
 	"fmt"
 	"reflect"
 	"sort"
 	"time"
 
-	"context"
 	"github.com/google/syzkaller/pkg/debugtracer"
 	"github.com/google/syzkaller/pkg/subsystem"
 	db "google.golang.org/appengine/v2/datastore"
diff --git a/dashboard/app/tree.go b/dashboard/app/tree.go
index 9cec1e70c..eece1beb1 100644
--- a/dashboard/app/tree.go
+++ b/dashboard/app/tree.go
@@ -9,12 +9,12 @@ package main
 // b) LabelReached -- reproducer does not work in any other kernel tree, TO which commits flow.
 
 import (
+	"context"
 	"fmt"
 	"sort"
 	"sync"
 	"time"
 
-	"context"
 	"github.com/google/syzkaller/dashboard/dashapi"
 	"golang.org/x/sync/errgroup"
 	db "google.golang.org/appengine/v2/datastore"
diff --git a/dashboard/app/util_test.go b/dashboard/app/util_test.go
index 19e03ff78..66663cb3c 100644
--- a/dashboard/app/util_test.go
+++ b/dashboard/app/util_test.go
@@ -8,6 +8,7 @@ package main
 
 import (
 	"bytes"
+	"context"
 	"errors"
 	"fmt"
 	"io"
@@ -23,7 +24,6 @@ import (
 	"testing"
 	"time"
 
-	"context"
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/syzkaller/dashboard/dashapi"
 	"github.com/google/syzkaller/pkg/email"
diff --git a/pkg/gce/gce.go b/pkg/gce/gce.go
index 9bbdaa7b3..792a3fb49 100644
--- a/pkg/gce/gce.go
+++ b/pkg/gce/gce.go
@@ -12,6 +12,7 @@
 package gce
 
 import (
+	"context"
 	"errors"
 	"fmt"
 	"io"
@@ -21,7 +22,6 @@ import (
 	"strings"
 	"time"
 
-	"context"
 	"golang.org/x/oauth2"
 	"golang.org/x/oauth2/google"
 	"google.golang.org/api/compute/v1"