diff options
| author | Gustavo Padovan <gustavo.padovan@collabora.com> | 2018-06-28 18:56:03 -0300 |
|---|---|---|
| committer | Gustavo Padovan <gustavo.padovan@collabora.com> | 2018-06-28 18:56:03 -0300 |
| commit | c981c01164d5e47b98973f92d4680df4287275c2 (patch) | |
| tree | 9f1513553c3136c8acd1a8bc9805cdd8aa16a483 /mm/memblock.c | |
| parent | eab976693153b9854bfa83d131374748f6ca4280 (diff) | |
| parent | 83d83bebf40132e2d55ec58af666713cc76f9764 (diff) | |
Merge tag 'ib-fbdev-drm-v4.19-deferred-console-takeover' of https://github.com/bzolnier/linux into drm-misc-next
Immutable branch between fbdev and drm for the v4.19 merge window
(contains the deferred console takeover feature)
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.com>
# gpg: Signature made Thu 28 Jun 2018 10:24:50 AM -03
# gpg: using RSA key 7E33B63FA047C20B
# gpg: Can't check signature: public key not found
# Conflicts:
# drivers/gpu/drm/i915/i915_gem.c
# drivers/gpu/drm/i915/intel_crt.c
# drivers/gpu/drm/i915/intel_display.c
# drivers/gpu/drm/i915/intel_lrc.c
Link: https://patchwork.freedesktop.org/patch/msgid/2462549.rLSfW9kX99@amdc3058
Diffstat (limited to 'mm/memblock.c')
| -rw-r--r-- | mm/memblock.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/mm/memblock.c b/mm/memblock.c index cc16d70b8333..03d48d8835ba 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -20,7 +20,6 @@ #include <linux/kmemleak.h> #include <linux/seq_file.h> #include <linux/memblock.h> -#include <linux/bootmem.h> #include <asm/sections.h> #include <linux/io.h> |