From bd608975c419acf6914fab946c0616115e9dcf2a Mon Sep 17 00:00:00 2001
From: Nastasha Solomon <79124755+nastasha-solomon@users.noreply.github.com>
Date: Mon, 26 May 2025 20:17:20 -0400
Subject: [PATCH 1/2] [Security] 8.17.7 release notes (#6852)

* First draft

* PR and styling

(cherry picked from commit a9b1b250db0b0a0340df9aa7264437d0a0be1c09)

# Conflicts:
#	docs/release-notes.asciidoc
---
 docs/release-notes.asciidoc      |  6 ++++++
 docs/release-notes/8.17.asciidoc | 10 ++++++++++
 2 files changed, 16 insertions(+)

diff --git a/docs/release-notes.asciidoc b/docs/release-notes.asciidoc
index 76e40bf953..725b84426c 100644
--- a/docs/release-notes.asciidoc
+++ b/docs/release-notes.asciidoc
@@ -3,6 +3,12 @@
 
 This section summarizes the changes in each release.
 
+<<<<<<< HEAD
+=======
+* <<release-notes-8.18.1, {elastic-sec} version 8.18.1>>
+* <<release-notes-8.18.0, {elastic-sec} version 8.18.0>>
+* <<release-notes-8.17.7, {elastic-sec} version 8.17.7>>
+>>>>>>> a9b1b250 ([Security] 8.17.7 release notes (#6852))
 * <<release-notes-8.17.6, {elastic-sec} version 8.17.6>>
 * <<release-notes-8.17.5, {elastic-sec} version 8.17.5>>
 * <<release-notes-8.17.4, {elastic-sec} version 8.17.4>>
diff --git a/docs/release-notes/8.17.asciidoc b/docs/release-notes/8.17.asciidoc
index 18474387b2..8c9551f568 100644
--- a/docs/release-notes/8.17.asciidoc
+++ b/docs/release-notes/8.17.asciidoc
@@ -1,6 +1,16 @@
 [[release-notes-header-8.17.0]]
 == 8.17
 
+[discrete]
+[[release-notes-8.17.7]]
+=== 8.17.7
+
+[discrete]
+[[bug-fixes-8.17.7]]
+==== Fixes
+* Fixes a bug that caused installed prebuilt detection rules to upgrade to their latest available versions when you installed a new {elastic-defend} integration or {agent} policy ({kibana-pull}218519[#218519]).
+* Fixes a bug in {elastic-defend} 8.16.0 where {elastic-endpoint} would incorrectly report some files as being `.NET`.
+
 [discrete]
 [[release-notes-8.17.6]]
 === 8.17.6

From 824a7046dd3b7e60e792079ce039eb1818b56453 Mon Sep 17 00:00:00 2001
From: Nastasha Solomon <nastasha.solomon@elastic.co>
Date: Tue, 27 May 2025 22:49:39 -0400
Subject: [PATCH 2/2] Fix conflict

---
 docs/release-notes.asciidoc | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/docs/release-notes.asciidoc b/docs/release-notes.asciidoc
index 725b84426c..458c5f6e12 100644
--- a/docs/release-notes.asciidoc
+++ b/docs/release-notes.asciidoc
@@ -3,12 +3,7 @@
 
 This section summarizes the changes in each release.
 
-<<<<<<< HEAD
-=======
-* <<release-notes-8.18.1, {elastic-sec} version 8.18.1>>
-* <<release-notes-8.18.0, {elastic-sec} version 8.18.0>>
 * <<release-notes-8.17.7, {elastic-sec} version 8.17.7>>
->>>>>>> a9b1b250 ([Security] 8.17.7 release notes (#6852))
 * <<release-notes-8.17.6, {elastic-sec} version 8.17.6>>
 * <<release-notes-8.17.5, {elastic-sec} version 8.17.5>>
 * <<release-notes-8.17.4, {elastic-sec} version 8.17.4>>