LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Matt Fleming <matt@codeblueprint.co.uk>
To: Ivan Khoronzhuk <ivan.khoronzhuk@linaro.org>
Cc: Grant Likely <grant.likely@linaro.org>,
	Ard Biesheuvel <ard.biesheuvel@linaro.org>,
	"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
	linux-api@vger.kernel.org, linux-doc@vger.kernel.org,
	Leif Lindholm <leif.lindholm@linaro.org>,
	Mark Salter <msalter@redhat.com>
Subject: Re: [Patch v4] firmware: dmi-sysfs: add SMBIOS entry point area attribute
Date: Wed, 11 Feb 2015 14:43:21 +0000	[thread overview]
Message-ID: <20150211144321.GB4665@codeblueprint.co.uk> (raw)
In-Reply-To: <20150211141703.GA4665@codeblueprint.co.uk>

On Wed, 11 Feb, at 02:17:03PM, Matt Fleming wrote:
> On Tue, 10 Feb, at 11:51:44AM, Ivan Khoronzhuk wrote:
> > 
> > If you are Ok with this patch, could you please pickup it?
> 
> Applied, thanks Ivan!

Btw this patch doesn't apply cleanly, the reject looks like this,

--- drivers/firmware/dmi_scan.c
+++ drivers/firmware/dmi_scan.c
@@ -537,6 +543,8 @@
 		dmi_ver &= 0xFFFFFF;
 		dmi_len = get_unaligned_le32(buf + 12);
 		dmi_base = get_unaligned_le64(buf + 16);
+		smbios_header_size = buf[6];
+		memcpy(smbios_header, buf, smbios_header_size);
 
 		/*
 		 * The 64-bit SMBIOS 3.0 entry point no longer has a field

What version of the kernel did you base this patch on? The conflict is
trivial to fixup and I've done so and pushed it out on the EFI 'next'
branch, but I wanted to call out this conflict explicitly.

-- 
Matt Fleming, Intel Open Source Technology Center

  reply	other threads:[~2015-02-11 14:43 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-02-04 17:06 Ivan Khoronzhuk
2015-02-10  9:51 ` Ivan Khoronzhuk
2015-02-11 14:17   ` Matt Fleming
2015-02-11 14:43     ` Matt Fleming [this message]
2015-02-12  2:33       ` Ivan Khoronzhuk
2015-02-26  9:36 ` [dmidecode] " Jean Delvare
2015-03-04 12:30   ` Ivan.khoronzhuk
2015-03-10  9:13     ` Jean Delvare
     [not found]       ` <1426162975.2784.31.camel@mfleming-mobl1.ger.corp.intel.com>
2015-03-16 21:02         ` Ivan.khoronzhuk
2015-03-26 13:05           ` Matt Fleming
2015-03-26 13:06             ` Ivan.khoronzhuk
2015-03-26 14:23               ` Jean Delvare
2015-03-19 17:33       ` Ivan.khoronzhuk

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=20150211144321.GB4665@codeblueprint.co.uk \
    --to=matt@codeblueprint.co.uk \
    --cc=ard.biesheuvel@linaro.org \
    --cc=grant.likely@linaro.org \
    --cc=ivan.khoronzhuk@linaro.org \
    --cc=leif.lindholm@linaro.org \
    --cc=linux-api@vger.kernel.org \
    --cc=linux-doc@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=msalter@redhat.com \
    --subject='Re: [Patch v4] firmware: dmi-sysfs: add SMBIOS entry point area attribute' \
    /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

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).