diff options
| author | Rui Salvaterra <rsalvaterra@gmail.com> | 2022-01-27 12:08:41 +0000 |
|---|---|---|
| committer | Daniel Golle <daniel@makrotopia.org> | 2022-02-01 23:34:07 +0000 |
| commit | 1343acc8cd9e5c4206c2f65f1897c7be5660f046 (patch) | |
| tree | 4136da2f12a4f25580f3f6f94ed87191b88e88b9 /target/linux/generic/pending-5.10/850-0011-PCI-aardvark-Fix-setting-MSI-address.patch | |
| parent | f2232544b879affe4e84c13fdf38da80e07c7360 (diff) | |
| download | upstream-1343acc8cd9e5c4206c2f65f1897c7be5660f046.tar.gz upstream-1343acc8cd9e5c4206c2f65f1897c7be5660f046.tar.bz2 upstream-1343acc8cd9e5c4206c2f65f1897c7be5660f046.zip | |
kernel: bump 5.10 to 5.10.94
Deleted (upstreamed):
bcm27xx/patches-5.10/950-0669-drm-vc4-hdmi-Make-sure-the-device-is-powered-with-CE.patch [1]
bcm27xx/patches-5.10/950-0672-drm-vc4-hdmi-Move-initial-register-read-after-pm_run.patch [1]
gemini/patches-5.10/0003-ARM-dts-gemini-NAS4220-B-fis-index-block-with-128-Ki.patch [2]
Manually rebased:
bcm27xx/patches-5.10/950-0675-drm-vc4-hdmi-Drop-devm-interrupt-handler-for-CEC-int.patch
Manually reverted:
generic/pending-5.10/860-Revert-ASoC-mediatek-Check-for-error-clk-pointer.patch [3]
[1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.94&id=55b10b88ac8654fc2f31518aa349a2e643b37f18
[2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.94&id=958a8819d41420d7a74ed922a09cacc0ba3a4218
[3] https://lore.kernel.org/all/trinity-2a727d96-0335-4d03-8f30-e22a0e10112d-1643363480085@3c-app-gmx-bap33/
Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Diffstat (limited to 'target/linux/generic/pending-5.10/850-0011-PCI-aardvark-Fix-setting-MSI-address.patch')
| -rw-r--r-- | target/linux/generic/pending-5.10/850-0011-PCI-aardvark-Fix-setting-MSI-address.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/pending-5.10/850-0011-PCI-aardvark-Fix-setting-MSI-address.patch b/target/linux/generic/pending-5.10/850-0011-PCI-aardvark-Fix-setting-MSI-address.patch index b5ddfdd97d..4807f24a12 100644 --- a/target/linux/generic/pending-5.10/850-0011-PCI-aardvark-Fix-setting-MSI-address.patch +++ b/target/linux/generic/pending-5.10/850-0011-PCI-aardvark-Fix-setting-MSI-address.patch @@ -56,7 +56,7 @@ Cc: stable@vger.kernel.org # f21a8b1b6837 ("PCI: aardvark: Move to MSI handling /* Enable MSI */ reg = advk_readl(pcie, PCIE_CORE_CTRL2_REG); reg |= PCIE_CORE_CTRL2_MSI_ENABLE; -@@ -1182,10 +1187,10 @@ static void advk_msi_irq_compose_msi_msg +@@ -1184,10 +1189,10 @@ static void advk_msi_irq_compose_msi_msg struct msi_msg *msg) { struct advk_pcie *pcie = irq_data_get_irq_chip_data(data); @@ -70,7 +70,7 @@ Cc: stable@vger.kernel.org # f21a8b1b6837 ("PCI: aardvark: Move to MSI handling msg->data = data->hwirq; } -@@ -1344,18 +1349,10 @@ static struct msi_domain_info advk_msi_d +@@ -1346,18 +1351,10 @@ static struct msi_domain_info advk_msi_d static int advk_pcie_init_msi_irq_domain(struct advk_pcie *pcie) { struct device *dev = &pcie->pdev->dev; |