From: Konrad Rzeszutek Wilk <konrad@kernel.org>
To: linux-kernel@vger.kernel.org, torvalds@linux-foundation.org
Cc: catalin.marinas@arm.com
Subject: [GIT PULL] (swiotlb) for 4.10
Date: Fri, 6 Jan 2017 13:16:39 -0500 [thread overview]
Message-ID: <20170106181638.GA18428@localhost.localdomain> (raw)
Hey Linus,
Please git pull the following branch:
git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb.git stable/for-linus-4.10
It has one fix to make i915 work when using Xen SWIOTLB,
and a feature from Geert to aid in debugging of devices
that can't do DMA outside the 32-bit address space.
The feature from Geert is on top of v4.10 merge window commit
(specifically you pulling my previous branch), as his changes were
dependent on the Documentation/ movement patches.
I figured it would just easier than me trying than to
cherry-pick the Documentation patches to satisfy git.
The patches have been soaking since 12/20, albeit I updated
the last patch due to linux-next catching an compiler error
and adding an Tested-and-Reported-by tag.
Thanks!
Documentation/admin-guide/kernel-parameters.txt | 3 +-
arch/arm64/mm/dma-mapping.c | 3 +-
arch/arm64/mm/init.c | 3 +-
arch/x86/kernel/pci-swiotlb.c | 6 +--
arch/x86/xen/pci-swiotlb-xen.c | 2 +-
drivers/gpu/drm/i915/i915_gem.c | 11 +-----
drivers/xen/swiotlb-xen.c | 8 +++-
include/linux/swiotlb.h | 11 +++++-
include/trace/events/swiotlb.h | 17 ++++----
lib/swiotlb.c | 52 ++++++++++++++++++++++---
10 files changed, 82 insertions(+), 34 deletions(-)
Geert Uytterhoeven (3):
x86, swiotlb: Simplify pci_swiotlb_detect_override()
swiotlb: Convert swiotlb_force from int to enum
swiotlb: Add swiotlb=noforce debug option
Konrad Rzeszutek Wilk (1):
swiotlb: Export swiotlb_max_segment to users
reply other threads:[~2017-01-06 18:16 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170106181638.GA18428@localhost.localdomain \
--to=konrad@kernel.org \
--cc=catalin.marinas@arm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®