Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1231127 > unrolled thread
| Started by | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| First post | 2015-09-23 05:50 +0200 |
| Last post | 2015-09-23 05:50 +0200 |
| Articles | 1 — 1 participant |
Back to article view | Back to linux.kernel
linux-next: manual merge of the akpm tree with the drm-misc tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-09-23 05:50 +0200
| From | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| Date | 2015-09-23 05:50 +0200 |
| Subject | linux-next: manual merge of the akpm tree with the drm-misc tree |
| Message-ID | <qbJea-Dl-11@gated-at.bofh.it> |
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in:
drivers/gpu/drm/drm_irq.c
between commit:
4e32087d8341 ("drm: Use vblank timestamps to guesstimate how many vblanks were missed")
from the drm-misc tree and patch:
"Remove abs64()"
from the akpm tree.
I fixed it up (the former removed the instances of abs64 in thet file)
and can carry the fix as necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Back to top | Article view | linux.kernel
csiph-web