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
--
To unsubscribe from this list: send the line "unsubscribe linux-api" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to