From adef0f88158d9798d8b1116a5f3e1e55f8c86849 Mon Sep 17 00:00:00 2001
From: Hannes Mehnert <hannes@mehnert.org>
Date: Wed, 30 Oct 2019 16:37:24 +0100
Subject: [PATCH] changes, remove unnecessary conflict

---
 CHANGES.md    | 4 ++++
 ethernet.opam | 3 ---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 37efb42..546f9a5 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,7 @@
+### v2.2.0 (2019-10-30)
+
+* Adapt to mirage-net 3.0.0 and mirage-protocols 4.0.0 changes (#6 @hannesm)
+
 ### v2.1.0 (2019-07-15)
 
 * Use ipaddr.4.0.0 interfaces (#5 @avsm)
diff --git a/ethernet.opam b/ethernet.opam
index f9e474a..b724435 100644
--- a/ethernet.opam
+++ b/ethernet.opam
@@ -31,9 +31,6 @@ depends: [
   "lwt" {>= "3.0.0"}
   "logs" {>= "0.6.0"}
 ]
-conflicts: [
-  "tcpip" {< "3.7.0"}
-]
 synopsis: "OCaml Ethernet (IEEE 802.3) layer, used in MirageOS"
 description: """
 `ethernet` provides an [Ethernet](https://en.wikipedia.org/wiki/Ethernet)