From abe156eecf0faf4a3d423b15185befe9f5fd7e27 Mon Sep 17 00:00:00 2001 From: Bob Glossman Date: Sun, 15 Apr 2018 17:26:07 -0700 Subject: [PATCH] LU-10847 doc: fix broken ChangeLog recent kernel update landings changed lines in the wrong section of the ChangeLog file. This patch moves the changes to the correct locaions. Test-Parameters: trivial Change-Id: I8ea3f35a8a8c6a6c7af3b23fa253cc882d0e61f3 Signed-off-by: Bob Glossman Reviewed-on: https://review.whamcloud.com/32003 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Minh Diep Reviewed-by: Oleg Drokin --- lustre/ChangeLog | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lustre/ChangeLog b/lustre/ChangeLog index 01fe958..4924f36 100644 --- a/lustre/ChangeLog +++ b/lustre/ChangeLog @@ -12,8 +12,8 @@ TBD Intel Corporation 3.0.101-0.47.71 (SLES11 SP3) 3.0.101-107 (SLES11 SP4) 3.12.74-60.64.40 (SLES12 SP1) - 4.4.114-92.64 (SLES12 SP2) - 4.4.114-94.11 (SLES12 SP3) + 4.4.120-92.70 (SLES12 SP2) + 4.4.120-94.17 (SLES12 SP3) 3.13.0-101 (Ubuntu 14.04, ZFS only) 4.4.0-85.108 (Ubuntu 14.04.5 LTS) 4.4.0-116 (Ubuntu 16.04) @@ -28,8 +28,8 @@ TBD Intel Corporation 3.0.101-0.47.71 (SLES11 SP3) 3.0.101-107 (SLES11 SP4) 3.12.74-60.64.40 (SLES12 SP1) - 4.4.114-92.64 (SLES12 SP2) - 4.4.114-94.11 (SLES12 SP3) + 4.4.120-92.70 (SLES12 SP2) + 4.4.120-94.17 (SLES12 SP3) 3.13.0-101 (Ubuntu 14.04) 4.4.0-85.108 (Ubuntu 14.04.5 LTS) 4.4.0-116 (Ubuntu 16.04) @@ -63,8 +63,8 @@ TBD Intel Corporation 3.0.101-0.47.71 (SLES11 SP3) 3.0.101-107 (SLES11 SP4) 3.12.74-60.64.40 (SLES12 SP1) - 4.4.120-92.70 (SLES12 SP2) - 4.4.120-94.17 (SLES12 SP3) + 4.4.114-92.64 (SLES12 SP2) + 4.4.114-94.11 (SLES12 SP3) 3.13.0-101 (Ubuntu 14.04, ZFS only) 4.4.0-85.108 (Ubuntu 14.04.5 LTS) 4.4.0-116 (Ubuntu 16.04) @@ -79,8 +79,8 @@ TBD Intel Corporation 3.0.101-0.47.71 (SLES11 SP3) 3.0.101-107 (SLES11 SP4) 3.12.74-60.64.40 (SLES12 SP1) - 4.4.120-92.70 (SLES12 SP2) - 4.4.120-94.17 (SLES12 SP3) + 4.4.114-92.64 (SLES12 SP2) + 4.4.114-94.11 (SLES12 SP3) 3.13.0-101 (Ubuntu 14.04) 4.4.0-85.108 (Ubuntu 14.04.5 LTS) 4.4.0-116 (Ubuntu 16.04) -- 1.8.3.1