linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Thomas Gleixner <tglx@linutronix.de>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: linux-kernel@vger.kernel.org, x86@kernel.org
Subject: [GIT pull] x86/boot fix for 5.1
Date: Sun, 10 Mar 2019 12:33:53 +0100	[thread overview]
Message-ID: <155221755097.13878.8902608678756592835.tglx@nanos.tec.linutronix.de> (raw)
In-Reply-To: 155221755096.13878.3370977359110476046.tglx@nanos.tec.linutronix.de

Linus,

please pull the latest x86-boot-for-linus git tree from:

   git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-boot-for-linus

A trivial fix for the previous x86/boot pull request which did not make it
in time.

Thanks,

	tglx

------------------>
Louis Taylor (1):
      x86/boot/KASLR: Always return a value from process_mem_region


 arch/x86/boot/compressed/kaslr.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/boot/compressed/kaslr.c b/arch/x86/boot/compressed/kaslr.c
index fa0332dda9f2..2e53c056ba20 100644
--- a/arch/x86/boot/compressed/kaslr.c
+++ b/arch/x86/boot/compressed/kaslr.c
@@ -697,8 +697,8 @@ static bool process_mem_region(struct mem_vector *region,
 			return 1;
 		}
 	}
-	return 0;
 #endif
+	return 0;
 }
 
 #ifdef CONFIG_EFI


  parent reply	other threads:[~2019-03-10 11:34 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-03-10 11:33 [GIT pull] core udpate for 5.1 Thomas Gleixner
2019-03-10 11:33 ` [GIT pull] locking fixes " Thomas Gleixner
2019-03-10 22:30   ` pr-tracker-bot
2019-03-10 11:33 ` [GIT pull] perf updates " Thomas Gleixner
2019-03-10 22:30   ` pr-tracker-bot
2019-03-10 11:33 ` [GIT pull] scheduler " Thomas Gleixner
2019-03-10 20:56   ` Linus Torvalds
2019-03-11  9:09     ` Ingo Molnar
2019-03-11 14:16     ` Thomas Gleixner
2019-03-10 11:33 ` [GIT pull] timer fix " Thomas Gleixner
2019-03-10 22:30   ` pr-tracker-bot
2019-03-10 11:33 ` [GIT pull] x86/asm " Thomas Gleixner
2019-03-10 21:43   ` Linus Torvalds
2019-03-11 14:22     ` Thomas Gleixner
2019-03-11 15:39       ` Linus Torvalds
2019-03-11 16:55         ` Kees Cook
2019-03-11 17:41           ` Linus Torvalds
2019-03-11 19:14             ` Kees Cook
     [not found]               ` <CAHk-=whQYG7iHO8Gv2Ka2_2tXNJkX1LdsyqKUZ=EO0aP6uS+2g@mail.gmail.com>
2019-03-11 20:36                 ` Kees Cook
2019-03-11 21:04                   ` Linus Torvalds
2019-03-10 11:33 ` Thomas Gleixner [this message]
2019-03-10 22:30   ` [GIT pull] x86/boot fix " pr-tracker-bot
2019-03-10 11:33 ` [GIT pull] x86 fixes " Thomas Gleixner
2019-03-10 22:30   ` pr-tracker-bot
2019-03-10 22:30 ` [GIT pull] core udpate " pr-tracker-bot

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=155221755097.13878.8902608678756592835.tglx@nanos.tec.linutronix.de \
    --to=tglx@linutronix.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=torvalds@linux-foundation.org \
    --cc=x86@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).