Skip to content

[pull] master from torvalds:master #740

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 6 commits into from
Nov 9, 2025
+13 −15
Merged

[pull] master from torvalds:master #740

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b1c9390
Revert "rtc: tps6586x: Fix initial enable_irq/disable_irq balance"
jonhunter Oct 31, 2025
0d51077
Revert "rtc: cpcap: Fix initial enable_irq/disable_irq balance"
jonhunter Oct 31, 2025
4113361
Revert "drm/nouveau: set DMA mask before creating the flush page"
airlied Nov 8, 2025
162f24c
rtc: rx8025: fix incorrect register reference
yuta-hayama Oct 15, 2025
41d318c
Merge tag 'rtc-6.18-fixes' of git://git.kernel.org/pub/scm/linux/kern…
torvalds Nov 8, 2025
439fc29
Merge tag 'drm-fixes-2025-11-09' of https://gitlab.freedesktop.org/dr…
torvalds Nov 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions drivers/gpu/drm/nouveau/nvkm/engine/device/pci.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1695,18 +1695,6 @@ nvkm_device_pci_new(struct pci_dev *pci_dev, const char *cfg, const char *dbg,
*pdevice = &pdev->device;
pdev->pdev = pci_dev;

/* Set DMA mask based on capabilities reported by the MMU subdev. */
if (pdev->device.mmu && !pdev->device.pci->agp.bridge)
bits = pdev->device.mmu->dma_bits;
else
bits = 32;

ret = dma_set_mask_and_coherent(&pci_dev->dev, DMA_BIT_MASK(bits));
if (ret && bits != 32) {
dma_set_mask_and_coherent(&pci_dev->dev, DMA_BIT_MASK(32));
pdev->device.mmu->dma_bits = 32;
}

ret = nvkm_device_ctor(&nvkm_device_pci_func, quirk, &pci_dev->dev,
pci_is_pcie(pci_dev) ? NVKM_DEVICE_PCIE :
pci_find_capability(pci_dev, PCI_CAP_ID_AGP) ?
Expand All @@ -1720,5 +1708,17 @@ nvkm_device_pci_new(struct pci_dev *pci_dev, const char *cfg, const char *dbg,
if (ret)
return ret;

/* Set DMA mask based on capabilities reported by the MMU subdev. */
if (pdev->device.mmu && !pdev->device.pci->agp.bridge)
bits = pdev->device.mmu->dma_bits;
else
bits = 32;

ret = dma_set_mask_and_coherent(&pci_dev->dev, DMA_BIT_MASK(bits));
if (ret && bits != 32) {
dma_set_mask_and_coherent(&pci_dev->dev, DMA_BIT_MASK(32));
pdev->device.mmu->dma_bits = 32;
}

return 0;
}
1 change: 0 additions & 1 deletion drivers/rtc/rtc-cpcap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,6 @@ static int cpcap_rtc_probe(struct platform_device *pdev)
return err;

rtc->alarm_irq = platform_get_irq(pdev, 0);
rtc->alarm_enabled = true;
err = devm_request_threaded_irq(dev, rtc->alarm_irq, NULL,
cpcap_rtc_alarm_irq,
IRQF_TRIGGER_NONE | IRQF_ONESHOT,
Expand Down
2 changes: 1 addition & 1 deletion drivers/rtc/rtc-rx8025.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ static int rx8025_init_client(struct i2c_client *client)
return hour_reg;
rx8025->is_24 = (hour_reg & RX8035_BIT_HOUR_1224);
} else {
rx8025->is_24 = (ctrl[1] & RX8025_BIT_CTRL1_1224);
rx8025->is_24 = (ctrl[0] & RX8025_BIT_CTRL1_1224);
}
out:
return err;
Expand Down
1 change: 0 additions & 1 deletion drivers/rtc/rtc-tps6586x.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,6 @@ static int tps6586x_rtc_probe(struct platform_device *pdev)

irq_set_status_flags(rtc->irq, IRQ_NOAUTOEN);

rtc->irq_en = true;
ret = devm_request_threaded_irq(&pdev->dev, rtc->irq, NULL,
tps6586x_rtc_irq,
IRQF_ONESHOT,
Expand Down