如何查询包含特定Bug修复的Linux内核及合并节点？

Great question! Let's break this down both for your specific iwlwifi bug (Kernel Bug 198357) and the general workflow to track any kernel bug fix across versions.

Your Specific Bug: Kernel Bug 198357 #

First, let's dive into the details of this CLOSED CODE_FIX issue, which references commit e1915c8195b3 and is marked as a regression.

1. Which pre-4.15 kernels include this fix? #

The original commit landed in the 4.15-rc6 development branch, but whether it's present in older stable branches (like 4.14.x, 4.9.x) depends on whether the kernel stable team backported it. Here's how to check:

• Clone the linux-stable repository if you haven't already: git clone git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git
• Switch to the stable branch you want to check (e.g., 4.14): git checkout linux-4.14.y
• Search for references to the bug or original commit:
  • Use git log --grep="198357" to find commits that mention the bug ID
  • Use git log --grep="e1915c8195b3" to look for backport commits (they typically reference the original hash in their message)
• A quicker way: In the main Linux kernel repo, run git branch --contains e1915c8195b3 to see all branches (development and stable) that include the original or backported fix.

If the original commit message includes CC: stable@vger.kernel.org, that's a strong hint the fix will be backported to supported stable branches. Networking driver fixes like this are often prioritized for backporting, so it's likely present in recent stable branches older than 4.15.

2. When was this fix merged? #

To get the exact merge time of the original fix, run this command in the kernel repo:

git show --pretty=fuller e1915c8195b3

Look for the CommitDate field—this tells you when the fix was merged into the 4.15-rc6 development branch. For backported versions, check the CommitDate of the backport commit in the respective stable branch.

General Workflow for Tracking Any Kernel Bug Fix #

Here's how to replicate this process for any kernel bug:

Step 1: Grab the fix commit ID #

From the kernel bugzilla entry, look for the CODE_FIX status—this will usually link to the specific commit hash (like e1915c8195b3). If not, check the bug comments; maintainers often mention the commit there.

Step 2: Identify which branches include the fix #

• Use git branch --contains <commit-hash> in the main kernel repo to list all branches that have the fix (original or backported).
• For stable branches, remember backported commits might have a different hash but will reference the original commit in their message.

Step 3: Find the merge timestamp #

• The git show --pretty=fuller <commit-hash> command gives you the original merge date. For backports, run the same command on the backport commit's hash.

Step 4: Confirm stable branch backports #

The kernel stable team maintains backports for supported branches. While you can check kernel.org's stable branch listings, using git to search directly is the most reliable way to confirm if a fix is included.

内容的提问来源于stack exchange，提问作者Tom Hale