13 files changed, 69 insertions, 36 deletions
diff --git a/doc/user_guide/checkers/features.rst b/doc/user_guide/checkers/features.rst
index a23c57c3e..bff61f93b 100644
--- a/doc/user_guide/checkers/features.rst
+++ b/doc/user_guide/checkers/features.rst
@@ -249,10 +249,10 @@ Classes checker Messages
   or a sequence is permitted.
 :invalid-slots-object (E0236): *Invalid object %r in __slots__, must contain only non empty strings*
   Used when an invalid (non-string) object occurs in __slots__.
-:no-method-argument (E0211): *Method has no argument*
+:no-method-argument (E0211): *Method %r has no argument*
   Used when a method which should have the bound instance as first argument has
   no argument defined.
-:no-self-argument (E0213): *Method should have "self" as first argument*
+:no-self-argument (E0213): *Method %r should have "self" as first argument*
   Used when a method has an attribute different the "self" as first argument.
   This is considered as an error since this is a so common convention that you
   shouldn't break it!
diff --git a/doc/whatsnew/2/2.15/index.rst b/doc/whatsnew/2/2.15/index.rst
index 0f1bb0423..5896de210 100644
--- a/doc/whatsnew/2/2.15/index.rst
+++ b/doc/whatsnew/2/2.15/index.rst
@@ -29,6 +29,71 @@ Marc Byrne became a maintainer, welcome to the team !
 
 .. towncrier release notes start
 
+What's new in Pylint 2.15.4?
+----------------------------
+Release date: 2022-10-10
+
+
+False Positives Fixed
+---------------------
+
+- Fix the message for ``unnecessary-dunder-call`` for ``__aiter__`` and
+  ``__aneext__``. Also
+  only emit the warning when ``py-version`` >= 3.10.
+
+  Closes #7529 (`#7529 <https://github.com/PyCQA/pylint/issues/7529>`_)
+
+
+
+Other Bug Fixes
+---------------
+
+- Fix bug in detecting ``unused-variable`` when iterating on variable.
+
+  Closes #3044 (`#3044 <https://github.com/PyCQA/pylint/issues/3044>`_)
+
+- Fixed handling of ``--`` as separator between positional arguments and flags.
+  This was not actually fixed in 2.14.5.
+
+  Closes #7003, Refs #7096 (`#7003
+  <https://github.com/PyCQA/pylint/issues/7003>`_)
+
+- Report ``no-self-argument`` rather than ``no-method-argument`` for methods
+  with variadic arguments.
+
+  Closes #7507 (`#7507 <https://github.com/PyCQA/pylint/issues/7507>`_)
+
+- Fixed an issue where ``syntax-error`` couldn't be raised on files with
+  invalid encodings.
+
+  Closes #7522 (`#7522 <https://github.com/PyCQA/pylint/issues/7522>`_)
+
+- Fix false positive for ``redefined-outer-name`` when aliasing ``typing``
+  e.g. as ``t`` and guarding imports under ``t.TYPE_CHECKING``.
+
+  Closes #7524 (`#7524 <https://github.com/PyCQA/pylint/issues/7524>`_)
+
+- Fixed a crash of the ``modified_iterating`` checker when iterating on a set
+  defined as a class attribute.
+
+  Closes #7528 (`#7528 <https://github.com/PyCQA/pylint/issues/7528>`_)
+
+- Fix bug in scanning of names inside arguments to `typing.Literal`.
+  See https://peps.python.org/pep-0586/#literals-enums-and-forward-references
+  for details.
+
+  Refs #3299 (`#3299 <https://github.com/PyCQA/pylint/issues/3299>`_)
+
+
+Other Changes
+-------------
+
+- Add method name to the error messages of ``no-method-argument`` and
+  ``no-self-argument``.
+
+  Closes #7507 (`#7507 <https://github.com/PyCQA/pylint/issues/7507>`_)
+
+
 What's new in Pylint 2.15.3?
 ----------------------------
 Release date: 2022-09-19
diff --git a/doc/whatsnew/fragments/3044.bugfix b/doc/whatsnew/fragments/3044.bugfix
deleted file mode 100644
index 9f764ca4b..000000000
--- a/doc/whatsnew/fragments/3044.bugfix
+++ /dev/null
@@ -1,3 +0,0 @@
-Fix bug in detecting ``unused-variable`` when iterating on variable.
-
-Closes #3044
diff --git a/doc/whatsnew/fragments/3299.bugfix b/doc/whatsnew/fragments/3299.bugfix
deleted file mode 100644
index dd45d1978..000000000
--- a/doc/whatsnew/fragments/3299.bugfix
+++ /dev/null
@@ -1,4 +0,0 @@
-Fix bug in scanning of names inside arguments to `typing.Literal`.
-See https://peps.python.org/pep-0586/#literals-enums-and-forward-references for details.
-
-Refs #3299
diff --git a/doc/whatsnew/fragments/7003.bugfix b/doc/whatsnew/fragments/7003.bugfix
deleted file mode 100644
index 3e2806f6f..000000000
--- a/doc/whatsnew/fragments/7003.bugfix
+++ /dev/null
@@ -1,4 +0,0 @@
-Fixed handling of ``--`` as separator between positional arguments and flags.
-This was not actually fixed in 2.14.5.
-
-Closes #7003, Refs #7096
diff --git a/doc/whatsnew/fragments/7507.bugfix b/doc/whatsnew/fragments/7507.bugfix
deleted file mode 100644
index 5ce05c658..000000000
--- a/doc/whatsnew/fragments/7507.bugfix
+++ /dev/null
@@ -1,4 +0,0 @@
-Report ``no-self-argument`` rather than ``no-method-argument`` for methods
-with variadic arguments.
-
-Closes #7507
diff --git a/doc/whatsnew/fragments/7507.other b/doc/whatsnew/fragments/7507.other
deleted file mode 100644
index 3cdca7465..000000000
--- a/doc/whatsnew/fragments/7507.other
+++ /dev/null
@@ -1,3 +0,0 @@
-Add method name to the error messages of ``no-method-argument`` and ``no-self-argument``.
-
-Closes #7507
diff --git a/doc/whatsnew/fragments/7522.bugfix b/doc/whatsnew/fragments/7522.bugfix
deleted file mode 100644
index f4fa9da1a..000000000
--- a/doc/whatsnew/fragments/7522.bugfix
+++ /dev/null
@@ -1,3 +0,0 @@
-Fixed an issue where ``syntax-error`` couldn't be raised on files with invalid encodings.
-
-Closes #7522
diff --git a/doc/whatsnew/fragments/7524.bugfix b/doc/whatsnew/fragments/7524.bugfix
deleted file mode 100644
index 8a9c5fc79..000000000
--- a/doc/whatsnew/fragments/7524.bugfix
+++ /dev/null
@@ -1,4 +0,0 @@
-Fix false positive for ``redefined-outer-name`` when aliasing ``typing``
-e.g. as ``t`` and guarding imports under ``t.TYPE_CHECKING``.
-
-Closes #7524
diff --git a/doc/whatsnew/fragments/7528.bugfix b/doc/whatsnew/fragments/7528.bugfix
deleted file mode 100644
index b06bf1570..000000000
--- a/doc/whatsnew/fragments/7528.bugfix
+++ /dev/null
@@ -1,3 +0,0 @@
-Fixed a crash of the ``modified_iterating`` checker when iterating on a set defined as a class attribute.
-
-Closes #7528
diff --git a/doc/whatsnew/fragments/7529.false_positive b/doc/whatsnew/fragments/7529.false_positive
deleted file mode 100644
index 7775d9086..000000000
--- a/doc/whatsnew/fragments/7529.false_positive
+++ /dev/null
@@ -1,4 +0,0 @@
-Fix the message for ``unnecessary-dunder-call`` for ``__aiter__`` and ``__aneext__``. Also
-only emit the warning when ``py-version`` >= 3.10.
-
-Closes #7529
diff --git a/pylint/__pkginfo__.py b/pylint/__pkginfo__.py
index 93f237ecb..189471a6d 100644
--- a/pylint/__pkginfo__.py
+++ b/pylint/__pkginfo__.py
@@ -9,7 +9,7 @@ It's updated via tbump, do not modify.
 
 from __future__ import annotations
 
-__version__ = "2.15.3"
+__version__ = "2.15.4"
 
 
 def get_numversion_from_version(v: str) -> tuple[int, int, int]:
diff --git a/tbump.toml b/tbump.toml
index 3c7efb0f6..3a7cfaa9b 100644
--- a/tbump.toml
+++ b/tbump.toml
@@ -1,7 +1,7 @@
 github_url = "https://github.com/PyCQA/pylint"
 
 [version]
-current = "2.15.3"
+current = "2.15.4"
 regex = '''
 ^(?P<major>0|[1-9]\d*)
 \.