Skip to content

Introduce explicit oot mode in backport script#282

Open
pravalikagurram1 wants to merge 1 commit intointel-gpu:kernel-backport/mainfrom
pravalikagurram1:dkms
Open

Introduce explicit oot mode in backport script#282
pravalikagurram1 wants to merge 1 commit intointel-gpu:kernel-backport/mainfrom
pravalikagurram1:dkms

Conversation

@pravalikagurram1
Copy link

  1. Add -m / --dkms option (with -dkms compatibility alias)
  2. Keep default create-tree behavior as non-DKMS (exclude dkms patches)
  3. Make DKMS mode apply all patches, including dkms patches using
    ./backport.sh -m
  4. Update README usage/options and examples to document new behavior
  5. This helps other components continue working on full-kernel
    integration instead of being forced into DKMS-only flow.

Signed-off-by: Pravalika Gurram pravalika.gurram@intel.com

@sys-i915-oscijenkins
Copy link

CI Bug Log - changes from xkb-221-5d4774a0011436a86e630421adb62addbe83e47a_BAT -> xkb-pr-main-282-493-f1a4aec83ca2a2fbba3e371c0254073a27625d5c_BAT

Summary

SUCCESS

No regressions found.

Participating hosts (8 -> 9)

Additional (1): bat-bmg-3

Known issues

Here are the changes found in xkb-pr-main-282-493-f1a4aec83ca2a2fbba3e371c0254073a27625d5c_BAT that come from known issues:

IGT changes

Issues hit

Build changes

  • Linux: xkb-221-5d4774a0011436a86e630421adb62addbe83e47a -> xkb-pr-main-282-493-f1a4aec83ca2a2fbba3e371c0254073a27625d5c

igt-xkb-104-c142aab3a: c142aab3a
xkb-221-5d4774a0011436a86e630421adb62addbe83e47a: 5d4774a
xkb-pr-main-282-493-f1a4aec83ca2a2fbba3e371c0254073a27625d5c: f1a4aec

backport.sh Outdated
;;
-k|--create-dkms-tree)
is_oot_tree=1
shift
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oot_tree and DKMS are two different naming, we should have uniformity

README.md Outdated
backport/patches/
├── base/ # All fixes and patches merged in drm-tip
├── dkms/ # DKMS-specific patches
└── features/ # Feature patches under review
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

dkms/ additional patches needed for oot modules

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I suggest lets use oot modules instead of dkms

README.md Outdated
|3. |reset-tree| Delete the existing tree and re-create it|
|4. |override| Overrides existing tree|
|2. |-k, --create-oot| Create DKMS tree and apply all patches including oot patches|
|3. |delete-tree| Delete the tree|
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

DKMS reference is confusing

Create Tree for OOT modules

@sys-i915-oscijenkins
Copy link

CI Bug Log - changes from xkb-223-cb5cf3e176472744c6f8258c194708e2c101a93a_BAT -> xkb-pr-main-282-506-246b79d8780c5439c6ccd56ae786cffd3c128d44_BAT

Summary

SUCCESS

No regressions found.

Participating hosts (9 -> 9)

No changes in participating hosts

Known issues

Here are the changes found in xkb-pr-main-282-506-246b79d8780c5439c6ccd56ae786cffd3c128d44_BAT that come from known issues:

IGT changes

Issues hit

Possible fixes

Build changes

  • Linux: xkb-223-cb5cf3e176472744c6f8258c194708e2c101a93a -> xkb-pr-main-282-506-246b79d8780c5439c6ccd56ae786cffd3c128d44

igt-xkb-104-c142aab3a: c142aab3a
xkb-223-cb5cf3e176472744c6f8258c194708e2c101a93a: cb5cf3e
xkb-pr-main-282-506-246b79d8780c5439c6ccd56ae786cffd3c128d44: 246b79d

@sys-i915-oscijenkins
Copy link

CI Bug Log - changes from xkb-223-cb5cf3e176472744c6f8258c194708e2c101a93a_BAT -> xkb-pr-main-282-507-026769fc95092f2acf1cd4979af5a6715499d251_BAT

Summary

SUCCESS

No regressions found.

Participating hosts (9 -> 9)

No changes in participating hosts

Known issues

Here are the changes found in xkb-pr-main-282-507-026769fc95092f2acf1cd4979af5a6715499d251_BAT that come from known issues:

IGT changes

Issues hit

Possible fixes

Build changes

  • Linux: xkb-223-cb5cf3e176472744c6f8258c194708e2c101a93a -> xkb-pr-main-282-507-026769fc95092f2acf1cd4979af5a6715499d251

igt-xkb-104-c142aab3a: c142aab3a
xkb-223-cb5cf3e176472744c6f8258c194708e2c101a93a: cb5cf3e
xkb-pr-main-282-507-026769fc95092f2acf1cd4979af5a6715499d251: 026769f

@pravalikagurram1 pravalikagurram1 changed the title Introduce explicit DKMS mode in backport script Introduce explicit oot mode in backport script Mar 11, 2026
Copy link
Contributor

@ayazahma ayazahma left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

-c has next Argument, which can base/features/ which should add "oot"
default is features

echo " -r, --reset-tree Delete the existing tree and re-create it"
echo " -o, --override Overrides the existing tree"
echo " -k, --create-oot Create oot tree (includes oot patches)"
exit 1
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Create kernel for OOT XEKMD Modules creation, include addition patches.

backport.sh Outdated
# Ignore comments/blank lines from series
case "$p" in
""|\#*)
continue
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why in two lines

@pravalikagurram1 pravalikagurram1 force-pushed the dkms branch 2 times, most recently from 48f58d7 to 2dbb7b0 Compare March 24, 2026 04:36
Introduce -o (--out-of-tree) as a secondary option that can be combined
with the default -c (--create-tree) option to control patch application

- Default behavior: ./backport.sh -c creates tree excluding OOT patches
- OOT mode: ./backport.sh -c -o creates tree with all patches including OOT

This allows other components to maintain full-kernel integration workflows
instead of being restricted to OOT-only mode.

Update script usage documentation and README with examples of the new
-c -o option syntax and behavioral differences.

Signed-off-by: Pravalika Gurram <pravalika.gurram@intel.com>
@sys-i915-oscijenkins
Copy link

CI Bug Log - changes from xkb-229-3c9354d5f9b0a98cc90a708e726ca0a04c2bb030_BAT -> xkb-pr-main-282-535-2dbb7b03a5b52bfad5a47a1c35b1a83f6bf19aec_BAT

Summary

SUCCESS

No regressions found.

Participating hosts (8 -> 9)

Additional (1): bat-bmg-2

Known issues

Here are the changes found in xkb-pr-main-282-535-2dbb7b03a5b52bfad5a47a1c35b1a83f6bf19aec_BAT that come from known issues:

IGT changes

Issues hit

Possible fixes

Build changes

  • IGT: igt-xkb-104-c142aab3a -> igt-xkb-106-c142aab3a
  • Linux: xkb-229-3c9354d5f9b0a98cc90a708e726ca0a04c2bb030 -> xkb-pr-main-282-535-2dbb7b03a5b52bfad5a47a1c35b1a83f6bf19aec

igt-xkb-104-c142aab3a: c142aab3a
igt-xkb-106-c142aab3a: c142aab3a
xkb-229-3c9354d5f9b0a98cc90a708e726ca0a04c2bb030: 3c9354d
xkb-pr-main-282-535-2dbb7b03a5b52bfad5a47a1c35b1a83f6bf19aec: 2dbb7b0

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants