From 8ef0c3173219d8ceb36d021b1f79b7a76376ac31 Mon Sep 17 00:00:00 2001
From: zariiii9003 <52598363+zariiii9003@users.noreply.github.com>
Date: Sun, 18 Jun 2023 16:38:45 +0200
Subject: [PATCH] update CHANGELOG.md and version to 4.2.2

---
 CHANGELOG.md    | 11 +++++++++++
 can/__init__.py |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a240cb650..493ac1966 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,14 @@
+Version 4.2.2
+=============
+
+Bug Fixes
+---------
+* Fix socketcan KeyError (#1598, #1599).
+* Fix IXXAT not properly shutdown message (#1606).
+* Fix Mf4Reader and TRCReader incompatibility with extra CLI args (#1610).
+* Fix decoding error in Kvaser constructor for non-ASCII product name (#1613). 
+
+
 Version 4.2.1
 =============
 
diff --git a/can/__init__.py b/can/__init__.py
index a14228f62..561059719 100644
--- a/can/__init__.py
+++ b/can/__init__.py
@@ -8,7 +8,7 @@
 import logging
 from typing import Any, Dict
 
-__version__ = "4.2.1"
+__version__ = "4.2.2"
 __all__ = [
     "ASCReader",
     "ASCWriter",