linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
	"H. Peter Anvin" <hpa@zytor.com>,
	Peter Zijlstra <peterz@infradead.org>,
	Catalin Marinas <catalin.marinas@arm.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Ard Biesheuvel <ard.biesheuvel@linaro.org>
Subject: linux-next: manual merge of the tip tree with the arm64 tree
Date: Fri, 26 Feb 2016 12:53:25 +1100	[thread overview]
Message-ID: <20160226125325.2f04f294@canb.auug.org.au> (raw)

Hi all,

Today's linux-next merge of the tip tree got a conflict in:

  drivers/firmware/efi/libstub/efistub.h

between commits:

  e4fbf4767440 ("efi: stub: implement efi_get_random_bytes() based on EFI_RNG_PROTOCOL")
  2ddbfc81eac8 ("efi: stub: add implementation of efi_random_alloc()")

from the arm64 tree and commit:

  b9d6769b5678 ("efi/arm*: Perform hardware compatibility check")

from the tip tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/firmware/efi/libstub/efistub.h
index 5ed3d3f38166,981c6035ce09..000000000000
--- a/drivers/firmware/efi/libstub/efistub.h
+++ b/drivers/firmware/efi/libstub/efistub.h
@@@ -43,11 -53,6 +53,13 @@@ void efi_get_virtmap(efi_memory_desc_t 
  		     unsigned long desc_size, efi_memory_desc_t *runtime_map,
  		     int *count);
  
 +efi_status_t efi_get_random_bytes(efi_system_table_t *sys_table,
 +				  unsigned long size, u8 *out);
 +
 +efi_status_t efi_random_alloc(efi_system_table_t *sys_table_arg,
 +			      unsigned long size, unsigned long align,
 +			      unsigned long *addr, unsigned long random_seed);
 +
+ efi_status_t check_platform_features(efi_system_table_t *sys_table_arg);
+ 
  #endif

             reply	other threads:[~2016-02-26  1:53 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-02-26  1:53 Stephen Rothwell [this message]
  -- strict thread matches above, loose matches on Subject: below --
2021-12-13 16:45 linux-next: manual merge of the tip tree with the arm64 tree broonie
2021-08-27  4:09 Stephen Rothwell
2020-05-22  6:11 Stephen Rothwell
2020-03-18  4:27 Stephen Rothwell
2020-03-18  8:50 ` Catalin Marinas
2020-03-10  1:49 Stephen Rothwell
2019-04-15  4:25 Stephen Rothwell
2019-04-15  4:21 Stephen Rothwell
2017-11-01  5:47 Stephen Rothwell
2017-11-13 22:52 ` Stephen Rothwell
2017-08-22  3:38 Stephen Rothwell
2017-09-04  5:29 ` Stephen Rothwell
2017-06-16  3:25 Stephen Rothwell
2017-07-03  1:29 ` Stephen Rothwell
2017-03-31  3:02 Stephen Rothwell
2017-03-31  9:32 ` Arnd Bergmann
2017-03-31 11:24   ` Stephen Rothwell
2016-09-12  2:54 Stephen Rothwell
2016-05-12  2:00 Stephen Rothwell
2016-04-29  3:56 Stephen Rothwell
2016-04-29  9:04 ` Matt Fleming
2016-02-26  1:53 Stephen Rothwell
2015-10-22  2:26 Stephen Rothwell
2015-10-22 12:06 ` Suzuki K. Poulose
2015-10-22 15:32   ` Catalin Marinas
2015-10-31 22:17     ` Stephen Rothwell
2015-10-15  3:05 Stephen Rothwell
2015-10-13  2:10 Stephen Rothwell
2015-10-13  9:50 ` Will Deacon
2014-05-23  6:44 Stephen Rothwell
2014-05-23  9:23 ` Catalin Marinas
2014-05-23  6:28 Stephen Rothwell
2014-05-23  8:41 ` Catalin Marinas

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=20160226125325.2f04f294@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=ard.biesheuvel@linaro.org \
    --cc=catalin.marinas@arm.com \
    --cc=hpa@zytor.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=mingo@elte.hu \
    --cc=peterz@infradead.org \
    --cc=tglx@linutronix.de \
    /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).