From e9a5a9b085e11ea04ee2ccee15de7b155037753d Mon Sep 17 00:00:00 2001 From: VISHAL KUMAR Date: Wed, 21 May 2025 20:24:58 +0530 Subject: [PATCH 01/13] Create pr.yml Signed-off-by: VISHAL KUMAR --- .github/workflows/pr.yml | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 .github/workflows/pr.yml diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml new file mode 100644 index 0000000000000..50551d6396f5e --- /dev/null +++ b/.github/workflows/pr.yml @@ -0,0 +1,33 @@ +name: pre_merge +on: + pull_request: + workflow_dispatch: + +jobs: + sync: + runs-on: self-hosted + steps: + - name: Checkout code + uses: actions/checkout@v4 + with: + ref: ${{ github.ref }} + fetch-depth: 0 + - name: sync code + run: | + git clone https://github.com/qualcomm-linux/kernel.git + git clone https://github.com/qualcomm-linux/automerge.git + TOPIC_BRANCH=${{ github.ref }} + do_conf() { + # Define the filename + FILENAME="merge.conf" + # Create the file with the specified content + cat < "$FILENAME" + baseline git@github.com:qualcomm-linux/kernel.git qcom-next + $TOPIC_BRANCH git@github.com:qualcomm-linux/kernel-topics.git $TOPIC_BRANCH + EOF + echo "File '$FILENAME' created successfully." + } + do_conf + cd kernel + ../automerge/ci-merge -f ../merge.conf -t head -n + From fb430e402bc6000d66c33a50c62877637a53b510 Mon Sep 17 00:00:00 2001 From: VISHAL KUMAR Date: Wed, 21 May 2025 20:32:11 +0530 Subject: [PATCH 02/13] Update pr.yml Signed-off-by: VISHAL KUMAR --- .github/workflows/pr.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 50551d6396f5e..8f1b4e861d7da 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -7,11 +7,6 @@ jobs: sync: runs-on: self-hosted steps: - - name: Checkout code - uses: actions/checkout@v4 - with: - ref: ${{ github.ref }} - fetch-depth: 0 - name: sync code run: | git clone https://github.com/qualcomm-linux/kernel.git From 063349cb2c483fbe914c65a489cc2589dad68868 Mon Sep 17 00:00:00 2001 From: VISHAL KUMAR Date: Wed, 21 May 2025 20:48:27 +0530 Subject: [PATCH 03/13] Create automerge.sh Signed-off-by: VISHAL KUMAR --- .github/scripts/automerge.sh | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 .github/scripts/automerge.sh diff --git a/.github/scripts/automerge.sh b/.github/scripts/automerge.sh new file mode 100644 index 0000000000000..0e2c79b9a2f47 --- /dev/null +++ b/.github/scripts/automerge.sh @@ -0,0 +1,18 @@ +TOPIC_BRANCH=$1 +do_conf() { + # Define the filename + FILENAME="merge.conf" + +# Create the file with the specified content +cat < "$FILENAME" +baseline git@github.com:qualcomm-linux/kernel.git qcom-next +$TOPIC_BRANCH git@github.com:qualcomm-linux/kernel-topics.git $TOPIC_BRANCH +EOF + + echo "File '$FILENAME' created successfully." +} + +do_conf + +cd kernel +../automerge/ci-merge -f ../merge.conf -t head -n From 7c1bfb8d21315d3c7dfcc87894d92f76289784fc Mon Sep 17 00:00:00 2001 From: VISHAL KUMAR Date: Wed, 21 May 2025 21:01:23 +0530 Subject: [PATCH 04/13] Update pr.yml Signed-off-by: VISHAL KUMAR --- .github/workflows/pr.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 8f1b4e861d7da..0291ef46c3797 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -7,22 +7,22 @@ jobs: sync: runs-on: self-hosted steps: - - name: sync code + - name: Clone repositories run: | git clone https://github.com/qualcomm-linux/kernel.git git clone https://github.com/qualcomm-linux/automerge.git + + - name: Create merge configuration + run: | TOPIC_BRANCH=${{ github.ref }} - do_conf() { - # Define the filename - FILENAME="merge.conf" - # Create the file with the specified content - cat < "$FILENAME" - baseline git@github.com:qualcomm-linux/kernel.git qcom-next - $TOPIC_BRANCH git@github.com:qualcomm-linux/kernel-topics.git $TOPIC_BRANCH - EOF - echo "File '$FILENAME' created successfully." - } - do_conf + cat < merge.conf + baseline git@github.com:qualcomm-linux/kernel.git qcom-next + $TOPIC_BRANCH git@github.com:qualcomm-linux/kernel-topics.git $TOPIC_BRANCH + EOF + echo "File 'merge.conf' created successfully." + + - name: Run auto merge + run: | cd kernel ../automerge/ci-merge -f ../merge.conf -t head -n From 0a3aa26cde0b8e3ef0493a99301b994bc367b136 Mon Sep 17 00:00:00 2001 From: VISHAL KUMAR Date: Wed, 21 May 2025 21:18:56 +0530 Subject: [PATCH 05/13] Update pr.yml Signed-off-by: VISHAL KUMAR --- .github/workflows/pr.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 0291ef46c3797..83168f8dc1857 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -1,7 +1,6 @@ name: pre_merge on: pull_request: - workflow_dispatch: jobs: sync: @@ -25,4 +24,9 @@ jobs: run: | cd kernel ../automerge/ci-merge -f ../merge.conf -t head -n - + + - name: Fetch the PR + run: | + cd kernel + git fetch origin pull/${{ github.event.pull_request.number }}/head:pr-${{ github.event.pull_request.number }} + git checkout pr-${{ github.event.pull_request.number }} From b4a021318d9b735d9b4b2cb66797e52f713c09b2 Mon Sep 17 00:00:00 2001 From: VISHAL KUMAR Date: Wed, 21 May 2025 21:34:18 +0530 Subject: [PATCH 06/13] Update pr.yml Signed-off-by: VISHAL KUMAR --- .github/workflows/pr.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 83168f8dc1857..f1bcccb9fd68f 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -13,7 +13,7 @@ jobs: - name: Create merge configuration run: | - TOPIC_BRANCH=${{ github.ref }} + TOPIC_BRANCH=${GITHUB_REF#refs/heads/} cat < merge.conf baseline git@github.com:qualcomm-linux/kernel.git qcom-next $TOPIC_BRANCH git@github.com:qualcomm-linux/kernel-topics.git $TOPIC_BRANCH @@ -25,8 +25,3 @@ jobs: cd kernel ../automerge/ci-merge -f ../merge.conf -t head -n - - name: Fetch the PR - run: | - cd kernel - git fetch origin pull/${{ github.event.pull_request.number }}/head:pr-${{ github.event.pull_request.number }} - git checkout pr-${{ github.event.pull_request.number }} From 28993709a90d809e0fccc0b6caadf0291ca529ac Mon Sep 17 00:00:00 2001 From: VISHAL KUMAR Date: Wed, 21 May 2025 21:46:30 +0530 Subject: [PATCH 07/13] Update pr.yml Signed-off-by: VISHAL KUMAR --- .github/workflows/pr.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index f1bcccb9fd68f..0d9238d30616e 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -6,14 +6,9 @@ jobs: sync: runs-on: self-hosted steps: - - name: Clone repositories - run: | - git clone https://github.com/qualcomm-linux/kernel.git - git clone https://github.com/qualcomm-linux/automerge.git - - name: Create merge configuration run: | - TOPIC_BRANCH=${GITHUB_REF#refs/heads/} + TOPIC_BRANCH=${{ github.head_ref }} cat < merge.conf baseline git@github.com:qualcomm-linux/kernel.git qcom-next $TOPIC_BRANCH git@github.com:qualcomm-linux/kernel-topics.git $TOPIC_BRANCH From 189e22ef5d3cef52979deda2e923ec2e75c40b19 Mon Sep 17 00:00:00 2001 From: VISHAL KUMAR Date: Wed, 21 May 2025 21:49:48 +0530 Subject: [PATCH 08/13] Update pr.yml Signed-off-by: VISHAL KUMAR --- .github/workflows/pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 0d9238d30616e..6a93b8b273d8b 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -8,7 +8,7 @@ jobs: steps: - name: Create merge configuration run: | - TOPIC_BRANCH=${{ github.head_ref }} + TOPIC_BRANCH=${{ github.base_ref }} cat < merge.conf baseline git@github.com:qualcomm-linux/kernel.git qcom-next $TOPIC_BRANCH git@github.com:qualcomm-linux/kernel-topics.git $TOPIC_BRANCH From cff296645ed4c8f4327f9a836c258d1b3001aa6f Mon Sep 17 00:00:00 2001 From: VISHAL KUMAR Date: Wed, 21 May 2025 21:50:09 +0530 Subject: [PATCH 09/13] Update pr.yml Signed-off-by: VISHAL KUMAR --- .github/workflows/pr.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 6a93b8b273d8b..976518cab425c 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -1,7 +1,8 @@ name: pre_merge on: pull_request: - + workflow_dispatch: + jobs: sync: runs-on: self-hosted From 80f79f10bac9b945802ee015f6357df71f078801 Mon Sep 17 00:00:00 2001 From: VISHAL KUMAR Date: Thu, 22 May 2025 18:14:19 +0530 Subject: [PATCH 10/13] Update pr.yml Signed-off-by: VISHAL KUMAR --- .github/workflows/pr.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 976518cab425c..7cd24e5f025c5 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -21,3 +21,9 @@ jobs: cd kernel ../automerge/ci-merge -f ../merge.conf -t head -n + - name: Fetch the PR + run: | + cd kernel + git fetch ${{ github.base_ref }} pull/${{ github.event.pull_request.number }}/head:pr-${{ github.event.pull_request.number }} + git checkout pr-${{ github.event.pull_request.number }} + From a2e6a5f840b006499575b045bc511a02a4fd2d96 Mon Sep 17 00:00:00 2001 From: VISHAL KUMAR Date: Thu, 22 May 2025 18:15:47 +0530 Subject: [PATCH 11/13] Update README Signed-off-by: VISHAL KUMAR --- README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README b/README index fd903645e6de0..c93f1c11dfeaa 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -Linux kernel +Linux kernel Topics ============ There are several guides for kernel developers and users. These guides can From 53278167080c4a00d125fca7402477fb8168a737 Mon Sep 17 00:00:00 2001 From: VISHAL KUMAR Date: Thu, 22 May 2025 18:29:41 +0530 Subject: [PATCH 12/13] Update pr.yml Signed-off-by: VISHAL KUMAR --- .github/workflows/pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 7cd24e5f025c5..8d2ff44887761 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -12,7 +12,7 @@ jobs: TOPIC_BRANCH=${{ github.base_ref }} cat < merge.conf baseline git@github.com:qualcomm-linux/kernel.git qcom-next - $TOPIC_BRANCH git@github.com:qualcomm-linux/kernel-topics.git $TOPIC_BRANCH + $TOPIC_BRANCH git@github.com:quic-viskuma/kernel-topics.git $TOPIC_BRANCH EOF echo "File 'merge.conf' created successfully." From 0ac0700f6bb5638cb6591a0d67437e9fa0b71acb Mon Sep 17 00:00:00 2001 From: VISHAL KUMAR Date: Thu, 22 May 2025 18:30:00 +0530 Subject: [PATCH 13/13] Delete README Signed-off-by: VISHAL KUMAR --- README | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 README diff --git a/README b/README deleted file mode 100644 index c93f1c11dfeaa..0000000000000 --- a/README +++ /dev/null @@ -1,18 +0,0 @@ -Linux kernel Topics -============ - -There are several guides for kernel developers and users. These guides can -be rendered in a number of formats, like HTML and PDF. Please read -Documentation/admin-guide/README.rst first. - -In order to build the documentation, use ``make htmldocs`` or -``make pdfdocs``. The formatted documentation can also be read online at: - - https://www.kernel.org/doc/html/latest/ - -There are various text files in the Documentation/ subdirectory, -several of them using the reStructuredText markup notation. - -Please read the Documentation/process/changes.rst file, as it contains the -requirements for building and running the kernel, and information about -the problems which may result by upgrading your kernel.