commit | aece4de8872bd5651851b3d0eae02e01830f566a | [log] [tgz] |
---|---|---|
author | Hikaru Nishida <hikalium@chromium.org> | Fri Oct 15 06:29:55 2021 |
committer | Commit Bot <commit-bot@chromium.org> | Wed Nov 10 04:16:55 2021 |
tree | 052b2271dbcfd3e98a43525a8ed7257f97743403 | |
parent | c331731f7bdb654c5527be35dfd8e92af18b76d8 [diff] |
Revert "BACKPORT: FROMLIST: x86/kvm: Add definitions for virtual suspend time injection" This reverts commit 6e445b5d596e7a9d50ed0109b7c0f1f55b3db4d7. Reason for revert: to prepare for the new version of clock fix Original change's description: > BACKPORT: FROMLIST: x86/kvm: Add definitions for virtual suspend time injection > > Add definitions of MSR, KVM_FEATURE bit, IRQ and a structure called > kvm_suspend_time that are used by later patchs to support the > virtual suspend time injection mechanism. > > Signed-off-by: Hikaru Nishida <hikalium@chromium.org> > (am from https://lore.kernel.org/patchwork/patch/1473210/) > (also found at https://lore.kernel.org/r/20210806190607.v2.2.I6e8f979820f45e38370aa19180a33a8c046d0fa9@changeid) > > Conflicts: > arch/x86/include/uapi/asm/kvm_para.h > > BUG=b:181617646 > TEST=built > > Change-Id: I6e8f979820f45e38370aa19180a33a8c046d0fa9 > Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/kernel/+/3089272 > Tested-by: Hikaru Nishida <hikalium@chromium.org> > Reviewed-by: Suleiman Souhlal <suleiman@chromium.org> > Commit-Queue: Hikaru Nishida <hikalium@chromium.org> Bug: b:181617646 Change-Id: Id150a26e74b73737f46f54d15425dd920a4bb6b1 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/kernel/+/3225385 Reviewed-by: Suleiman Souhlal <suleiman@chromium.org> Tested-by: Hikaru Nishida <hikalium@chromium.org> Commit-Queue: Hikaru Nishida <hikalium@chromium.org>
BEST: Make all of your changes to upstream Linux. If appropriate, backport to the stable releases. These patches will be merged automatically in the corresponding common kernels. If the patch is already in upstream Linux, post a backport of the patch that conforms to the patch requirements below.
EXPORT_SYMBOL_GPL()
require an in-tree modular driver that uses the symbol -- so include the new driver or changes to an existing driver in the same patchset as the export.LESS GOOD: Develop your patches out-of-tree (from an upstream Linux point-of-view). Unless these are fixing an Android-specific bug, these are very unlikely to be accepted unless they have been coordinated with kernel-team@android.com. If you want to proceed, post a patch that conforms to the patch requirements below.
script/checkpatch.pl
UPSTREAM:
, BACKPORT:
, FROMGIT:
, FROMLIST:
, or ANDROID:
.Change-Id:
tag (see https://gerrit-review.googlesource.com/Documentation/user-changeid.html)Bug:
tag.Signed-off-by:
tag by the author and the submitterAdditional requirements are listed below based on patch type
UPSTREAM:
, BACKPORT:
UPSTREAM:
.(cherry picked from commit ...)
lineimportant patch from upstream This is the detailed description of the important patch Signed-off-by: Fred Jones <fred.jones@foo.org>
- then Joe Smith would upload the patch for the common kernel as
UPSTREAM: important patch from upstream This is the detailed description of the important patch Signed-off-by: Fred Jones <fred.jones@foo.org> Bug: 135791357 Change-Id: I4caaaa566ea080fa148c5e768bb1a0b6f7201c01 (cherry picked from commit c31e73121f4c1ec41143423ac6ce3ce6dafdcec1) Signed-off-by: Joe Smith <joe.smith@foo.org>
BACKPORT:
instead of UPSTREAM:
.UPSTREAM:
(cherry picked from commit ...)
lineBACKPORT: important patch from upstream This is the detailed description of the important patch Signed-off-by: Fred Jones <fred.jones@foo.org> Bug: 135791357 Change-Id: I4caaaa566ea080fa148c5e768bb1a0b6f7201c01 (cherry picked from commit c31e73121f4c1ec41143423ac6ce3ce6dafdcec1) [joe: Resolved minor conflict in drivers/foo/bar.c ] Signed-off-by: Joe Smith <joe.smith@foo.org>
FROMGIT:
, FROMLIST:
,FROMGIT:
(cherry picked from commit <sha1> <repo> <branch>)
. This must be a stable maintainer branch (not rebased, so don't use linux-next
for example).BACKPORT: FROMGIT:
important patch from upstream This is the detailed description of the important patch Signed-off-by: Fred Jones <fred.jones@foo.org>
- then Joe Smith would upload the patch for the common kernel as
FROMGIT: important patch from upstream This is the detailed description of the important patch Signed-off-by: Fred Jones <fred.jones@foo.org> Bug: 135791357 (cherry picked from commit 878a2fd9de10b03d11d2f622250285c7e63deace https://git.kernel.org/pub/scm/linux/kernel/git/foo/bar.git test-branch) Change-Id: I4caaaa566ea080fa148c5e768bb1a0b6f7201c01 Signed-off-by: Joe Smith <joe.smith@foo.org>
FROMLIST:
Link:
tag with a link to the submittal on lore.kernel.orgBug:
tag with the Android bug (required for patches not accepted into a maintainer tree)BACKPORT: FROMLIST:
FROMLIST: important patch from upstream This is the detailed description of the important patch Signed-off-by: Fred Jones <fred.jones@foo.org> Bug: 135791357 Link: https://lore.kernel.org/lkml/20190619171517.GA17557@someone.com/ Change-Id: I4caaaa566ea080fa148c5e768bb1a0b6f7201c01 Signed-off-by: Joe Smith <joe.smith@foo.org>
ANDROID:
ANDROID:
Fixes:
tag that cites the patch with the bugANDROID: fix android-specific bug in foobar.c This is the detailed description of the important fix Fixes: 1234abcd2468 ("foobar: add cool feature") Change-Id: I4caaaa566ea080fa148c5e768bb1a0b6f7201c01 Signed-off-by: Joe Smith <joe.smith@foo.org>
ANDROID:
Bug:
tag with the Android bug (required for android-specific features)