• Subject: [edk2] [Patch][edk2-platforms] Vlv2TbltDevicePkg: Update BIOS ID to V0.96
  • Author: lushifex
  • Date: June 20, 2017, 7:14 a.m.
  • Patches: 1 / 1
Changeset
Vlv2TbltDevicePkg/BiosIdD.env    | 2 +-
Vlv2TbltDevicePkg/BiosIdR.env    | 2 +-
Vlv2TbltDevicePkg/BiosIdx64D.env | 2 +-
Vlv2TbltDevicePkg/BiosIdx64R.env | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
Git apply log
Switched to a new branch '39eb0801-207e-4f95-9cde-1fab7e2e51c0@SHWDEOPENPSI011.local'
Applying: Vlv2TbltDevicePkg: Update BIOS ID to V0.96
fatal: sha1 information is lacking or useless (Vlv2TbltDevicePkg/BiosIdD.env).
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0001 Vlv2TbltDevicePkg: Update BIOS ID to V0.96
The copy of the patch that failed is found in:
   /var/tmp/tmp6lp5779d/.git/rebase-apply/patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Failed to apply patch:
[edk2] [Patch][edk2-platforms] Vlv2TbltDevicePkg: Update BIOS ID to V0.96
[edk2] [Patch][edk2-platforms] Vlv2TbltDevicePkg: Update BIOS ID to V0.96
Posted by lushifex, 8 weeks ago
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: lushifex <shifeix.a.lu@intel.com>
---
 Vlv2TbltDevicePkg/BiosIdD.env    | 2 +-
 Vlv2TbltDevicePkg/BiosIdR.env    | 2 +-
 Vlv2TbltDevicePkg/BiosIdx64D.env | 2 +-
 Vlv2TbltDevicePkg/BiosIdx64R.env | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Vlv2TbltDevicePkg/BiosIdD.env b/Vlv2TbltDevicePkg/BiosIdD.env
index da079c3..f47bf31 100644
--- a/Vlv2TbltDevicePkg/BiosIdD.env
+++ b/Vlv2TbltDevicePkg/BiosIdD.env
@@ -35,5 +35,5 @@ OEM_ID        = I32
 BUILD_TYPE    = D
 
 BOARD_ID = BLAKCRB
-VERSION_MAJOR = 0095
+VERSION_MAJOR = 0096
 VERSION_MINOR = 01
diff --git a/Vlv2TbltDevicePkg/BiosIdR.env b/Vlv2TbltDevicePkg/BiosIdR.env
index b03c6f2..7d322f3 100644
--- a/Vlv2TbltDevicePkg/BiosIdR.env
+++ b/Vlv2TbltDevicePkg/BiosIdR.env
@@ -35,5 +35,5 @@ OEM_ID        = I32
 BUILD_TYPE    = R
 
 BOARD_ID = BLAKCRB
-VERSION_MAJOR = 0095
+VERSION_MAJOR = 0096
 VERSION_MINOR = 01
diff --git a/Vlv2TbltDevicePkg/BiosIdx64D.env b/Vlv2TbltDevicePkg/BiosIdx64D.env
index 5845b51..c358f4c 100644
--- a/Vlv2TbltDevicePkg/BiosIdx64D.env
+++ b/Vlv2TbltDevicePkg/BiosIdx64D.env
@@ -25,6 +25,6 @@ BOARD_REV     = 1
 OEM_ID        = X64
 BUILD_TYPE    = D
 
-VERSION_MAJOR = 0095
+VERSION_MAJOR = 0096
 VERSION_MINOR = 01
 BOARD_ID = BBAYCRB 
diff --git a/Vlv2TbltDevicePkg/BiosIdx64R.env b/Vlv2TbltDevicePkg/BiosIdx64R.env
index e1e5721..12fafe1 100644
--- a/Vlv2TbltDevicePkg/BiosIdx64R.env
+++ b/Vlv2TbltDevicePkg/BiosIdx64R.env
@@ -25,6 +25,6 @@ BOARD_REV     = 1
 OEM_ID        = X64
 BUILD_TYPE    = R
 
-VERSION_MAJOR = 0095
+VERSION_MAJOR = 0096
 VERSION_MINOR = 01
 BOARD_ID = BBAYCRB 
-- 
2.7.0.windows.1


_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel