Skip to contentSkip to conversation

drm-intel-next

GIT PULL Daniel Vetter 2 participants 3 messages Aug 4, 2013 – Aug 7, 2013

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

Hi Dave,

Neat that QA (and Ben) keeps on humming along while I'm on vacation, so you already get the next feature pull request:
- proper eLLC support for HSW from Ben
- more interrupt refactoring
- add w/a tags where we implement them already (Damien)
- hangcheck fixes (Chris) + hangcheck stats (Mika)
- flesh out the new vm structs for ppgtt and ggtt (Ben)
- PSR for Haswell, still disabled by default (Rodrigo et al.)
- pc8+ refclock sequence code from Paulo
- more interrupt refactoring from Paulo, unifying ilk/snb with the ivb/hsw interrupt code
- full solution for the Haswell concurrent reg access issues (Chris)
- fix racy object accounting, used by some new leak tests
- fix sync polarity settings on ch7xxx dvo encoder
- random bits&pieces, little fixes and better debug output all over

QA had a bit a regression-fest due to the PSR support - obviously not disabled-by-default hard enough ;-) Hence I've smashed the fix from Chris on top (which is thanks to Ben already confirmed by QA to make stuff work again).

Note that I've had to backmerge from Linus tree to resolve a few issues, hence why the pull request is this large. I've added the shortlog of just the non-upstream changes.

Cheers, Daniel

The following changes since commit ee114b97e67b2a572f94982567a21ac4ee17c133:

Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (2013-07-18 17:39:05 -0700)

are available in the git repository at:

git://people.freedesktop.org/~danvet/drm-intel tags/drm-intel-next-2013-07-26-fixed

for you to fetch changes up to cd234b0bfd5ab012e42274b24aae420fa1823d58:

drm/i915: Do not dereference NULL crtc or fb until after checking (2013-08-04 21:13:43 +0200)

----------------------------------------------------------------
Shortlog of the non-upstream patches (real pull request log further down):

Ben Widawsky (12):
drm/i915/hsw: Set correct Haswell PTE encodings. drm/i915: Define some of the eLLC magic drm/i915: store eLLC size
drm/i915: Use eLLC/LLC by default when available drm/i915: debugfs entries for [e]LLC
drm/i915: Move gtt and ppgtt under address space umbrella drm/i915: Put the mm in the parent address space drm/i915: Create a global list of vms
drm/i915: Move active/inactive lists to new mm drm/i915: Free stolen node on failed preallocation drm/i915: Create VMAs
drm/i915: Make i915 events part of uapi

Chris Wilson (12):
drm/i915: Fix retrieval of hangcheck stats
drm/i915: Replace open-coding of DEFAULT_CONTEXT_ID
drm/i915: Add some debug breadcrumbs to connector detection drm/i915: Use Graphics Base of Stolen Memory on all gen3+ drm/i915: Colocate all GT access routines in the same file drm/i915: Use a private interface for register access within GT drm/i915: Use the common register access functions for NOTRACE variants drm/i915: Squash gen lookup through multiple indirections inside GT access drm/i915: Convert the register access tracepoint to be conditional drm/i915: Retry DP aux_ch communications with a different clock after failure drm/i915: Replace open-coded offset_in_page()
drm/i915: Do not dereference NULL crtc or fb until after checking

Damien Lespiau (5):
drm/i915: We implement WaFbcWaitForVBlankBeforeEnable for ilk and snb drm/i915: We implement WaFbcAsynchFlipDisableFbcQueue on ilk and snb drm/i915: We implement WaFbcDisableDpfcClockGating on ilk drm/i915: We implement WaMPhyProgramming on Haswell drm/i915: Don't try to calculate RC6 residency on GEN4 and before

Dan Carpenter (2):
drm/i915: checking for NULL instead of IS_ERR() drm/i915: use after free on error path

Daniel Vetter (10):
drm/i915: unify PM interrupt preinstall sequence
drm/i915: unify GT/PM irq postinstall code
drm/i915: extract rps interrupt enable/disable helpers
drm/i915: simplify rps interrupt enabling/disabling sequence
drm/i915: fix up error cleanup in i915_gem_object_bind_to_gtt
drm/i915: disable stolen mem for OVERLAY_NEEDS_PHYSICAL
drm/i915: fix reference counting in i915_gem_create
Merge commit 'Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux'
drm/i915: fix the racy object accounting
drm/i915: fix pnv display core clock readout out

Egbert Eich (1):
drm/i915: Add messages useful for HPD storm detection debugging (v2)

Imre Deak (2):
drm/i915: restore debug message lost in merge resolution drm/i915: dvo_ch7xxx: fix vsync polarity setting

Mika Kuoppala (1):
drm/i915: introduce i915_queue_hangcheck

Paulo Zanoni (16):
drm/i915: remove SDV support from lpt_pch_init_refclk drm/i915: extract FDI mPHY functions from lpt_init_pch_refclk drm/i915: extract lpt_enable_clkout_dp from lpt_init_pch_refclk drm/i915: kill ivybridge_irq_preinstall
drm/i915: extract ilk_display_irq_handler
drm/i915: extract ivb_display_irq_handler
drm/i915: don't read or write GEN6_PMIIR on Gen 5 drm/i915: reorganize ironlake_irq_handler
drm/i915: POSTING_READ(DEIER) on ivybridge_irq_handler drm/i915: add ILK/SNB support to ivybridge_irq_handler drm/i915: kill Ivybridge vblank irq vfuncs
drm/i915: kill ivybridge_irq_postinstall
drm/i915: invert {ilk, snb}_gt_irq_handler check drm/i915: extend lpt_enable_clkout_dp
drm/i915: disable CLKOUT_DP when it's not needed drm/i915: add functions to disable and restore LCPLL

Rodrigo Vivi (7):
drm/i915: split aux_clock_divider logic in a separated function for reuse. drm/i915: Enable/Disable PSR
drm/i915: Added debugfs support for PSR Status
drm/i915: Match all PSR mode entry conditions before enabling it. drm/intel: add enable_psr module option and disable psr by default drm/i915: add update function to disable/enable-back PSR drm/i915: Hook PSR functionality

Shobhit Kumar (2):
drm: Added SDP and VSC structures for handling PSR for eDP drm/i915: Read the EDP DPCD and PSR Capability

Xiong Zhang (1):
drm/i915: add prefault_disable module option

----------------------------------------------------------------
Aaro Koskinen (1):
MIPS: tlbex: fix broken build in v3.11-rc1

Aaron Lu (2):
ACPICA: expose OSI version
ACPI / video: no automatic brightness changes by win8-compatible firmware

Al Viro (2):
allow O_TMPFILE to work with O_WRONLY
livelock avoidance in sget()

Alexander Z Lam (2):
tracing: Fix error handling to ensure instances can always be removed
tracing: Miscellaneous fixes for trace_array ref counting

Alexandre Belloni (2):
iio: Fix iio_channel_has_info
iio: inkern: fix iio_convert_raw_to_processed_unlocked

Andreas Gruenbacher (2):
drbd: Do not sleep inside rcu
drbd: Fix rcu_read_lock balance on error path

Asias He (3):

      vhost-net: Always access vq->private_data under vq mutex
      vhost-scsi: Always access vq->private_data under vq mutex
      vhost: Remove custom vhost rcu usage

Ben Skeggs (4):
Merge remote-tracking branch 'airlied/drm-next' into drm-nouveau-next drm/nouveau: fix locking issues in page flipping paths drm/nv50/kms: fix pin refcnt leaks
drm/nouveau: use dedicated channel for async moves on GT/GF chipsets.

Ben Widawsky (12):
drm/i915/hsw: Set correct Haswell PTE encodings. drm/i915: Define some of the eLLC magic drm/i915: store eLLC size
drm/i915: Use eLLC/LLC by default when available drm/i915: debugfs entries for [e]LLC
drm/i915: Move gtt and ppgtt under address space umbrella drm/i915: Put the mm in the parent address space drm/i915: Create a global list of vms
drm/i915: Move active/inactive lists to new mm drm/i915: Free stolen node on failed preallocation drm/i915: Create VMAs
drm/i915: Make i915 events part of uapi

Catalin Marinas (1):
arm64: Only enable local interrupts after the CPU is marked online

Chanwoo Choi (1):
PM / Sleep: Fix comment typo in pm_wakeup.h

Chen Gang (3):
arm64: add '#ifdef CONFIG_COMPAT' for aarch32_break_handler()
alpha: kernel: using memcpy() instead of strcpy()
alpha: kernel: typo issue, using '1' instead of '11'

Chris Wilson (14):
drm/i915: Fix retrieval of hangcheck stats
drm/i915: Replace open-coding of DEFAULT_CONTEXT_ID
drm/i915: Fix dereferencing invalid connectors in is_crtc_connector_off() drm/i915: Serialize almost all register access
drm/i915: Add some debug breadcrumbs to connector detection drm/i915: Use Graphics Base of Stolen Memory on all gen3+ drm/i915: Colocate all GT access routines in the same file drm/i915: Use a private interface for register access within GT drm/i915: Use the common register access functions for NOTRACE variants drm/i915: Squash gen lookup through multiple indirections inside GT access drm/i915: Convert the register access tracepoint to be conditional drm/i915: Retry DP aux_ch communications with a different clock after failure drm/i915: Replace open-coded offset_in_page()
drm/i915: Do not dereference NULL crtc or fb until after checking

Damien Lespiau (5):
drm/i915: We implement WaFbcWaitForVBlankBeforeEnable for ilk and snb drm/i915: We implement WaFbcAsynchFlipDisableFbcQueue on ilk and snb drm/i915: We implement WaFbcDisableDpfcClockGating on ilk drm/i915: We implement WaMPhyProgramming on Haswell drm/i915: Don't try to calculate RC6 residency on GEN4 and before

Dan Carpenter (3):
bcache: check for allocation failures drm/i915: checking for NULL instead of IS_ERR() drm/i915: use after free on error path

Daniel Baluta (1):
ndisc: bool initializations should use true and false

Daniel Vetter (17):
drm/i915: fix up readout of the lvds dither bit on gen2/3
drm/i915: fix pfit regression for non-autoscaled resolutions
drm/i915: unify PM interrupt preinstall sequence
drm/i915: unify GT/PM irq postinstall code
drm/i915: extract rps interrupt enable/disable helpers
drm/i915: simplify rps interrupt enabling/disabling sequence
drm/i915: Sanitize shared dpll state
Merge tag 'v3.10' into drm-intel-fixes
drm/i915: correctly restore fences with objects attached
drm/i915: fix up gt init sequence fallout
drm/crtc-helper: explicit DPMS on after modeset
drm/i915: fix up error cleanup in i915_gem_object_bind_to_gtt
drm/i915: disable stolen mem for OVERLAY_NEEDS_PHYSICAL
drm/i915: fix reference counting in i915_gem_create
Merge commit 'Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux'
drm/i915: fix the racy object accounting
drm/i915: fix pnv display core clock readout out

Dave Airlie (2):
Merge branch 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6
Merge tag 'drm-intel-fixes-2013-07-22' of git://people.freedesktop.org/~danvet/drm-intel into drm-fixes

David Howells (1):

      Fix __wait_on_atomic_t() to call the action func if the counter != 0

David S. Miller (1):
net: Fix sysfs_format_mac() code duplication.

Dragos Foianu (2):
ethtool: fixed trailing statements in ethtool net/irda: fixed style issues in irlan_eth

Egbert Eich (1):
drm/i915: Add messages useful for HPD storm detection debugging (v2)

Eric Dumazet (3):
ipv4: set transport header earlier
vlan: mask vlan prio bits
vlan: fix a race in egress prio management

Faidon Liambotis (1):
MIPS: Octeon: Fix DT pruning bug with pip ports

Florian Fainelli (1):
MIPS: BMIPS: Fix thinko to release slave TP from reset

Gabriel de Perthuis (4):
bcache: Warn when a device is already registered.
bcache: Send a uevent with a cached device's UUID
bcache: Send label uevents
bcache: Refresh usage docs

Ganesan Ramalingam (1):
MIPS: Netlogic: Fix USB block's coherent DMA mask

Greg Kroah-Hartman (2):
staging: csr: remove driver
Merge tag 'iio-fixes-for-3.11a' of git://git.kernel.org/.../jic23/iio into staging-linus

Haiyang Zhang (1):
hyperv: Fix the NETIF_F_SG flag setting in netvsc

Hauke Mehrtens (1):
bgmac: add dependency to phylib

Heiko Carstens (4):
s390/bpf,jit: call module_free() from any context s390/bpf,jit: use generic jit dumper s390/bpf,jit: address randomize and write protect jit code s390/bpf,jit: add pkt_type support

Imre Deak (2):
drm/i915: restore debug message lost in merge resolution drm/i915: dvo_ch7xxx: fix vsync polarity setting

Ingo Tuchscherer (1):
s390/zcrypt: Alias for new zcrypt device driver base module

Jacek Anaszewski (1):
iio: lps331ap: Fix wrong in_pressure_scale output value

James Hogan (1):
MIPS: KVM: Mark KVM_GUEST (T&E KVM) as BROKEN_ON_SMP

Jan Beulich (2):
xen/io/ring.h: new macro to detect whether there are too many requests on the ring
xen-netfront: pull on receive skb may need to happen earlier

Jason Wang (4):
macvtap: fix the missing ret value of TUNSETQUEUE
macvtap: do not assume 802.1Q when send vlan packets
tuntap: do not zerocopy if iov needs more pages than MAX_SKB_FRAGS
macvtap: do not zerocopy if iov needs more pages than MAX_SKB_FRAGS

Javier Martinez Canillas (3):
gpio/omap: don't create an IRQ mapping for every GPIO on DT gpio/omap: auto request GPIO as input if used as IRQ via DT gpio/omap: fix build error when OF_GPIO is not defined.

Jayachandran C (1):
MIPS: Netlogic: Add XLP PIC irqdomain

Jens Axboe (4):
Merge branch 'stable/for-jens-3.10' of git://git.kernel.org/.../konrad/xen into for-3.11/drivers Merge tag 'v3.10-rc7' into for-3.11/drivers
Merge branch 'bcache-for-3.11' of git://evilpiepirate.org/~kent/linux-bcache into for-3.11/drivers Merge branch 'bcache-for-3.11' of git://evilpiepirate.org/~kent/linux-bcache into for-3.11/drivers

Joe Perches (1):
alpha: Convert print_symbol to %pSR

Jonathan Cameron (1):

      iio:trigger: device_unregister->device_del to avoid double free

Josef Bacik (3):
Btrfs: update drop progress before stopping snapshot dropping
Btrfs: fix lock leak when resuming snapshot deletion
Btrfs: re-add root to dead root list if we stop dropping it

Kamal Mostafa (1):
drm/i915: quirk no PCH_PWM_ENABLE for Dell XPS13 backlight

Kent Overstreet (21):
bcache: fix a spurious gcc complaint, use scnprintf
bcache: Convert allocator thread to kthread
bcache: Refactor btree io
bcache: Fix/revamp tracepoints
bcache: Rip out pkey()/pbtree()
bcache: Improve lazy sorting
bcache: Initialize sectors_dirty when attaching
bcache: Track dirty data by stripe
bcache: Write out full stripes
bcache: FUA fixes
bcache: Document shrinker reserve better
bcache: Delete fuzz tester
bcache: Update email address
bcache: Use standard utility code
bcache: Fix a dumb race
bcache: Advertise that flushes are supported
bcache: Fix a sysfs splat on shutdown
bcache: Shutdown fix
bcache: Journal replay fix
bcache: Fix GC_SECTORS_USED() calculation
bcache: Allocation kthread fixes

Konrad Rzeszutek Wilk (4):
xen-blkfront: Introduce a 'max' module parameter to alter the amount of indirect segments. xen-blkback/sysfs: Move the parameters for the persistent grant features xen/blkback: Check device permissions before allowing OP_DISCARD xen/blkback: Check for insane amounts of request on the ring (v6).

Konstantin Khlebnikov (1):
drm/i915: fix long-standing SNB regression in power consumption after resume v2

Kumar Amit Mehta (1):
md: bcache: io.c: fix a potential NULL pointer dereference

Lan Tianyu (1):
ACPI / video: ignore BIOS initial backlight value for Fujitsu E753

Linus Torvalds (23):
Merge git://git.kernel.org/.../davem/net
Merge tag 'pm+acpi-3.11-rc2' of git://git.kernel.org/.../rafael/linux-pm
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm
Merge branch 'for-linus' of git://git.kernel.org/.../s390/linux
Merge tag 'arm64-stable' of git://git.kernel.org/.../cmarinas/linux-aarch64
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
Merge branch 'for-linus' of git://git.kernel.org/.../rw/uml
Merge branch 'for-linus' of git://git.kernel.org/.../josef/btrfs-next
Merge tag 'nfs-for-3.11-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs
Merge tag 'ext4_for_linus' of git://git.kernel.org/.../tytso/ext4
Merge branch 'for-linus' of git://git.kernel.org/.../viro/vfs
Merge tag 'staging-3.11-rc2' of git://git.kernel.org/.../gregkh/staging
Merge tag 'ext4_for_linus' of git://git.kernel.org/.../tytso/ext4
Merge tag 'acpi-video-3.11' of git://git.kernel.org/.../rafael/linux-pm
Linux 3.11-rc2
Merge branch 'for-3.11/drivers' of git://git.kernel.dk/linux-block
Merge tag 'gpio-for-v3.11-2' of git://git.kernel.org/.../linusw/linux-gpio
Merge branch 'next' of git://git.kernel.org/.../rzhang/linux
Merge tag 'trace-3.11-rc2' of git://git.kernel.org/.../rostedt/linux-trace
Merge branch 'for-linus' of git://git.kernel.org/.../mszeredi/fuse
Merge tag 'for_linus' of git://git.kernel.org/.../mst/vhost
Merge branch 'for-linus' of git://git.kernel.org/.../mattst88/alpha
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux

Liu ShuoX (2):
PM / Sleep: avoid 'autosleep' in shutdown progress PNP / ACPI: avoid garbage in resource name

Maarten Lankhorst (5):
drm/nouveau: fix some error-path leaks in fbcon handling code drm/nouveau: do not unpin in nouveau_gem_object_del drm/nouveau: bump fence timeout to 15 seconds drm/nouveau: add falcon interrupt handler drm/nouveau: do not allow negative sizes for now

Marc Zyngier (1):
arm64: use common reboot infrastructure

Marek Vasut (2):
iio: mxs-lradc: Fix misuse of iio->trig
iio: mxs-lradc: Remove useless check in read_raw

Markos Chandras (1):
MIPS: kvm: Kconfig: Drop HAVE_KVM dependency from VIRTUALIZATION

Masami Hiramatsu (1):
tracing/kprobe: Wait for disabling all running kprobe handlers

Masanari Iida (1):
doc: Fix typo in documentation/bcache.txt

Matthew Garrett (1):
ACPI / video: Always call acpi_video_init_brightness() on init

Michael Holzheu (2):
s390/kdump: Disable mmap for s390
s390/kdump: Allow copy_oldmem_page() copy to virtual memory

Michael Mueller (1):
s390/ptrace: PTRACE_TE_ABORT_RAND

Mika Kuoppala (1):
drm/i915: introduce i915_queue_hangcheck

Miklos Szeredi (4):
fuse: readdirplus: sanity checks
fuse: readdirplus: fix instantiate
fuse: readdirplus: change attributes once
fuse: readdirplus: cleanup

Neil Horman (1):
atl1e: unmap partially mapped skb on dma error and free skb

Niels de Vos (1):
fuse: readdirplus: fix dentry leak

Oleg Nesterov (7):
tracing/function: Avoid perf_trace_buf_*() if event_function.perf_events is empty tracing/syscall: Avoid perf_trace_buf_*() if sys_data->perf_events is empty tracing/perf: Move the PERF_MAX_TRACE_SIZE check into perf_trace_buf_prepare()
tracing: Simplify the iteration logic in f_start/f_next
tracing: Do not (ab)use trace_seq in event_id_read()
tracing: Kill trace_array->waiter
tracing: Kill the unbalanced tr->ref++ in tracing_buffers_open()

Paolo Valente (1):
pkt_sched: sch_qfq: remove a source of high packet delay/jitter

Paul Bolle (2):
cpufreq: s3c24xx: rename CONFIG_CPU_FREQ_S3C24XX_DEBUGFS
cpufreq: s3c24xx: fix "depends on ARM_S3C24XX" in Kconfig

Paulo Zanoni (16):
drm/i915: remove SDV support from lpt_pch_init_refclk drm/i915: extract FDI mPHY functions from lpt_init_pch_refclk drm/i915: extract lpt_enable_clkout_dp from lpt_init_pch_refclk drm/i915: kill ivybridge_irq_preinstall
drm/i915: extract ilk_display_irq_handler
drm/i915: extract ivb_display_irq_handler
drm/i915: don't read or write GEN6_PMIIR on Gen 5 drm/i915: reorganize ironlake_irq_handler
drm/i915: POSTING_READ(DEIER) on ivybridge_irq_handler drm/i915: add ILK/SNB support to ivybridge_irq_handler drm/i915: kill Ivybridge vblank irq vfuncs
drm/i915: kill ivybridge_irq_postinstall
drm/i915: invert {ilk, snb}_gt_irq_handler check drm/i915: extend lpt_enable_clkout_dp
drm/i915: disable CLKOUT_DP when it's not needed drm/i915: add functions to disable and restore LCPLL

Peng Tao (1):
vfs: constify dentry parameter in d_count()

Peter Meerwald (1):
iio staging: fix lis3l02dq, read error handling

Philip J Kelleher (11):
rsxx: Individual workqueues for interruptible events.
rsxx: Restructured DMA cancel scheme.
rsxx: Fixes soft-lockup issues during DMAs.
rsxx: Allow block size to be determined by configuration.
rsxx: Adding in sync_start module paramenter.
rsxx: Changing the adapter name to the official name.
rsxx: Fixes DLPAR add kernel panic if partition still mounted.
rsxx: Adapter address space sanity check.
rsxx: Adding EEH check inside cregs timeout.
rsxx: Fixes incorrect stats calculation.
rsxx: Adding in debugfs entries.

Philipp Reisner (3):
drbd: Ignore the exit code of a fence-peer handler if it returns too late
drbd: Constants should be UPPERCASE
drbd: Allow online change of al-stripes and al-stripe-size

Rafael J. Wysocki (5):
ACPI / scan: Do not try to attach scan handlers to devices having them ACPI / scan: Always call acpi_bus_scan() for bus check notifications ACPI / video / i915: No ACPI backlight if firmware expects Windows 8 Merge branch 'acpi-fixes'
Merge branch 'pm-fixes'

Ralf Baechle (1):
MIPS: Delete dead invocation of exception_exit().

Richard Henderson (10):
alpha: Add kcmp and finit_module syscalls
alpha: Modernize lib/mpi/longlong.h
alpha: Improve atomic_add_unless
alpha: Implement atomic64_dec_if_positive
alpha: Generate dwarf2 unwind info for various kernel entry points.
alpha: Fix type compatibility warning for marvel_map_irq
alpha: Use __builtin_alpha_rpcc
alpha: Don't if-out dp264_device_interrupt.
alpha: Force the user-visible HZ to a constant 1024.
alpha: Use handle_percpu_irq for the timer interrupt

Richard Weinberger (5):
um: Fix return value of strnlen_user()
um: Mark stub pages mapping with VM_PFNMAP
um: Fix wait_stub_done() error handling
um: siginfo cleanup
um: remove dead code

Rodrigo Vivi (7):
drm/i915: split aux_clock_divider logic in a separated function for reuse. drm/i915: Enable/Disable PSR
drm/i915: Added debugfs support for PSR Status
drm/i915: Match all PSR mode entry conditions before enabling it. drm/intel: add enable_psr module option and disable psr by default drm/i915: add update function to disable/enable-back PSR drm/i915: Hook PSR functionality

Roger Pau Monne (12):
xen-blkback: print stats about persistent grants
xen-blkback: use balloon pages for all mappings
xen-blkback: implement LRU mechanism for persistent grants
xen-blkback: move pending handles list from blkbk to pending_req
xen-blkback: make the queue of free requests per backend
xen-blkback: expand map/unmap functions
xen-block: implement indirect descriptors
xen-blkback: allocate list of pending reqs in small chunks
xen-blkfront: use a different scatterlist for each request
xen-blkback: workaround compiler bug in gcc 4.1
xen-blkfront: set blk_queue_max_hw_sectors correctly
xen-blkback: check the number of iovecs before allocating a bios

Rohit Vaswani (1):
drivers: gpio: msm: Fix the error condition for reading ngpio

Sarveshwar Bandi (1):
be2net: Fix to avoid hardware workaround when not needed

Sebastian Ott (1):
s390/qdio: remove unused variable

Shobhit Kumar (2):
drm: Added SDP and VSC structures for handling PSR for eDP drm/i915: Read the EDP DPCD and PSR Capability

Srinivas Pandruvada (2):
Thermal: x86 package temp thermal crash
Thermal: x86_pkg_temp: Limit number of pkg temp zones

Srivatsa S. Bhat (2):
cpufreq: Revert commit a66b2e to fix suspend/resume regression
cpufreq: Revert commit 2f7021a8 to fix CPU hotplug regression

Stefan Bader (1):
xen/blkback: Use physical sector size for setup

Stefan Behrens (1):
Btrfs: fix wrong write offset when replacing a device

Steven Rostedt (1):
Thermal: Fix lockup of cpu_down()

Steven Rostedt (Red Hat) (1):
tracing: Add ref_data to function and fgraph tracer structs

Stéphane Marchesin (1):
drm/i915: Preserve the DDI_A_4_LANES bit from the bios

Theodore Ts'o (5):
ext4: fix error handling in ext4_ext_truncate()
ext4: simplify calculation of blocks to free on error
ext4: make the extent_status code more robust against ENOMEM failures
ext4: yield during large unlinks
ext4: call ext4_es_lru_add() after handling cache miss

Tim Gardner (1):
mlx5 core: Fix __udivdi3 when compiling for 32 bit arches

Tony Wu (1):
MIPS: tlbex: Fix typo in r3000 tlb store handler

Toshi Kani (1):
ACPI / memhotplug: Fix a stale pointer in error path

Tristan Schmelcher (1):
uml: Fix which_tmpdir failure when /dev/shm is a symlink, and in other edge cases

Trond Myklebust (3):
SUNRPC: Fix another issue with rpc_client_register()
NFSv4: Fix a regression against the FreeBSD server
NFSv4: Fix brainfart in attribute length calculation

Wei Yongjun (5):
drbd: fix error return code in drbd_init()
iio: dac: ad7303: fix error return code in ad7303_probe()
iio: ti_am335x_adc: add missing .driver_module to struct iio_info staging:iio:ad7291: add missing .driver_module to struct iio_info
Thermal: x86_pkg_temp: fix krealloc() misuse in in pkg_temp_thermal_device_add()

Will Deacon (2):
arm64: mm: don't treat user cache maintenance faults as writes
alpha: locks: remove unused arch_*_relax operations

Xiao Guangrong (1):
KVM: MMU: avoid fast page fault fixing mmio page fault

Xiong Zhang (1):
drm/i915: add prefault_disable module option

Zheng Liu (2):
ext4: fix a BUG when opening a file with O_TMPFILE flag
ext3: fix a BUG when opening a file with O_TMPFILE flag

stephen hemminger (1):
vxlan: add necessary locking on device removal

zhangwei(Jovi) (3):
tracing: Use correct config guard CONFIG_STACK_TRACER
tracing: Use trace_seq_puts()/trace_seq_putc() where possible
tracing: Typo fix on ring buffer comments

 Documentation/ABI/testing/sysfs-driver-xen-blkback |   17 +
 .../ABI/testing/sysfs-driver-xen-blkfront          |   10 +
 Documentation/bcache.txt                           |   37 +-
 MAINTAINERS                                        |    4 +-
 Makefile                                           |    2 +-
 arch/alpha/Kconfig                                 |    1 +
 arch/alpha/include/asm/atomic.h                    |   88 +-
 arch/alpha/include/asm/param.h                     |    8 +-
 arch/alpha/include/asm/spinlock.h                  |    4 -
 arch/alpha/include/asm/unistd.h                    |    3 +-
 arch/alpha/include/uapi/asm/param.h                |    7 -
 arch/alpha/include/uapi/asm/unistd.h               |    2 +
 arch/alpha/kernel/entry.S                          |  399 +-
 arch/alpha/kernel/irq_alpha.c                      |    2 +-
 arch/alpha/kernel/smp.c                            |    5 +-
 arch/alpha/kernel/sys_dp264.c                      |    8 -
 arch/alpha/kernel/sys_marvel.c                     |    3 +-
 arch/alpha/kernel/systbls.S                        |    2 +
 arch/alpha/kernel/time.c                           |    4 +-
 arch/alpha/kernel/traps.c                          |    8 +-
 arch/arm/mach-s3c24xx/Kconfig                      |    2 +-
 arch/arm64/include/asm/debug-monitors.h            |    7 -
 arch/arm64/include/asm/system_misc.h               |    3 +-
 arch/arm64/kernel/process.c                        |    2 +-
 arch/arm64/kernel/smp.c                            |   15 +-
 arch/arm64/mm/fault.c                              |   46 +-
 arch/mips/Kconfig                                  |    1 +
 arch/mips/cavium-octeon/octeon-platform.c          |    5 +-
 arch/mips/kernel/smp-bmips.c                       |    2 +-
 arch/mips/kernel/traps.c                           |    1 -
 arch/mips/kvm/Kconfig                              |    1 -
 arch/mips/mm/tlbex.c                               |    4 +-
 arch/mips/netlogic/common/irq.c                    |   68 +-
 arch/mips/netlogic/dts/xlp_evp.dts                 |    3 +-
 arch/mips/netlogic/dts/xlp_svp.dts                 |    3 +-
 arch/mips/netlogic/xlp/usb-init.c                  |    2 +-
 arch/s390/include/asm/processor.h                  |   10 +-
 arch/s390/include/asm/switch_to.h                  |    4 +-
 arch/s390/include/uapi/asm/ptrace.h                |    1 +
 arch/s390/kernel/crash_dump.c                      |   51 +-
 arch/s390/kernel/ptrace.c                          |   50 +-
 arch/s390/net/bpf_jit_comp.c                       |  113 +-
 arch/um/include/shared/frame_kern.h                |    8 +-
 arch/um/kernel/signal.c                            |    4 +-
 arch/um/kernel/skas/mmu.c                          |    2 +-
 arch/um/kernel/skas/uaccess.c                      |    2 +-
 arch/um/os-Linux/mem.c                             |  230 +-
 arch/um/os-Linux/signal.c                          |    8 +-
 arch/um/os-Linux/skas/process.c                    |   19 +-
 arch/x86/kvm/mmu.c                                 |    7 +
 arch/x86/um/signal.c                               |    1 -
 drivers/acpi/acpi_memhotplug.c                     |    1 +
 drivers/acpi/acpica/aclocal.h                      |   13 -
 drivers/acpi/internal.h                            |   11 +
 drivers/acpi/scan.c                                |   13 +-
 drivers/acpi/video.c                               |   98 +-
 drivers/acpi/video_detect.c                        |   21 +
 drivers/block/Kconfig                              |    4 +-
 drivers/block/drbd/drbd_actlog.c                   |   21 +
 drivers/block/drbd/drbd_int.h                      |   15 +-
 drivers/block/drbd/drbd_main.c                     |   61 +-
 drivers/block/drbd/drbd_nl.c                       |  185 +-
 drivers/block/drbd/drbd_receiver.c                 |   12 +-
 drivers/block/drbd/drbd_state.c                    |    4 +-
 drivers/block/rsxx/core.c                          |  359 +-
 drivers/block/rsxx/cregs.c                         |   14 +
 drivers/block/rsxx/dev.c                           |   33 +-
 drivers/block/rsxx/dma.c                           |  185 +-
 drivers/block/rsxx/rsxx_priv.h                     |   10 +-
 drivers/block/xen-blkback/blkback.c                |  872 ++-
 drivers/block/xen-blkback/common.h                 |  147 +-
 drivers/block/xen-blkback/xenbus.c                 |   85 +
 drivers/block/xen-blkfront.c                       |  532 +-
 drivers/cpufreq/cpufreq.c                          |    4 +-
 drivers/cpufreq/cpufreq_governor.c                 |    3 -
 drivers/cpufreq/cpufreq_stats.c                    |    6 +-
 drivers/cpufreq/s3c24xx-cpufreq.c                  |    4 +-
 drivers/gpio/gpio-msm-v2.c                         |    2 +-
 drivers/gpio/gpio-omap.c                           |   84 +-
 drivers/gpu/drm/drm_crtc_helper.c                  |   27 +-
 drivers/gpu/drm/drm_mm.c                           |   31 +-
 drivers/gpu/drm/i915/Makefile                      |    2 +
 drivers/gpu/drm/i915/dvo_ch7xxx.c                  |    2 +-
 drivers/gpu/drm/i915/i915_debugfs.c                |  836 +--
 drivers/gpu/drm/i915/i915_dma.c                    |   87 +-
 drivers/gpu/drm/i915/i915_drv.c                    |  292 +-
 drivers/gpu/drm/i915/i915_drv.h                    |  413 +-
 drivers/gpu/drm/i915/i915_gem.c                    |  317 +-
 drivers/gpu/drm/i915/i915_gem_context.c            |   25 +-
 drivers/gpu/drm/i915/i915_gem_debug.c              |    2 +-
 drivers/gpu/drm/i915/i915_gem_evict.c              |   34 +-
 drivers/gpu/drm/i915/i915_gem_execbuffer.c         |   37 +-
 drivers/gpu/drm/i915/i915_gem_gtt.c                |  265 +-
 drivers/gpu/drm/i915/i915_gem_stolen.c             |  131 +-
 drivers/gpu/drm/i915/i915_gem_tiling.c             |   14 +-
 drivers/gpu/drm/i915/i915_gpu_error.c              |  973 +++
 drivers/gpu/drm/i915/i915_irq.c                    | 1354 ++--
 drivers/gpu/drm/i915/i915_reg.h                    |  110 +-
 drivers/gpu/drm/i915/i915_sysfs.c                  |   71 +
 drivers/gpu/drm/i915/i915_trace.h                  |   16 +-
 drivers/gpu/drm/i915/intel_crt.c                   |    4 +
 drivers/gpu/drm/i915/intel_ddi.c                   |   12 +-
 drivers/gpu/drm/i915/intel_display.c               | 1094 ++--
 drivers/gpu/drm/i915/intel_dp.c                    |  418 +-
 drivers/gpu/drm/i915/intel_drv.h                   |   36 +-
 drivers/gpu/drm/i915/intel_dvo.c                   |    5 +-
 drivers/gpu/drm/i915/intel_fb.c                    |    8 +-
 drivers/gpu/drm/i915/intel_hdmi.c                  |    3 +
 drivers/gpu/drm/i915/intel_lvds.c                  |   36 +-
 drivers/gpu/drm/i915/intel_overlay.c               |   22 +-
 drivers/gpu/drm/i915/intel_panel.c                 |    6 +-
 drivers/gpu/drm/i915/intel_pm.c                    |  431 +-
 drivers/gpu/drm/i915/intel_ringbuffer.c            |   43 +-
 drivers/gpu/drm/i915/intel_ringbuffer.h            |    5 +-
 drivers/gpu/drm/i915/intel_sdvo.c                  |   30 +-
 drivers/gpu/drm/i915/intel_sprite.c                |    8 +-
 drivers/gpu/drm/i915/intel_tv.c                    |    4 +
 drivers/gpu/drm/i915/intel_uncore.c                |  595 ++
 drivers/gpu/drm/nouveau/core/engine/bsp/nvc0.c     |    1 +
 drivers/gpu/drm/nouveau/core/engine/bsp/nve0.c     |    1 +
 drivers/gpu/drm/nouveau/core/engine/falcon.c       |   19 +
 drivers/gpu/drm/nouveau/core/engine/ppp/nvc0.c     |    1 +
 drivers/gpu/drm/nouveau/core/engine/vp/nvc0.c      |    1 +
 drivers/gpu/drm/nouveau/core/engine/vp/nve0.c      |    1 +
 .../gpu/drm/nouveau/core/include/engine/falcon.h   |    2 +
 drivers/gpu/drm/nouveau/nouveau_bo.c               |   21 +-
 drivers/gpu/drm/nouveau/nouveau_display.c          |   69 +-
 drivers/gpu/drm/nouveau/nouveau_drm.c              |   15 +-
 drivers/gpu/drm/nouveau/nouveau_fbcon.c            |    1 +
 drivers/gpu/drm/nouveau/nouveau_fence.c            |    2 +-
 drivers/gpu/drm/nouveau/nouveau_gem.c              |    6 -
 drivers/gpu/drm/nouveau/nv50_display.c             |   46 +-
 drivers/iio/adc/ti_am335x_adc.c                    |    1 +
 drivers/iio/dac/ad7303.c                           |    4 +-
 drivers/iio/industrialio-trigger.c                 |    2 +-
 drivers/iio/inkern.c                               |    2 +-
 drivers/iio/pressure/st_pressure_core.c            |    6 +-
 drivers/md/bcache/alloc.c                          |   46 +-
 drivers/md/bcache/bcache.h                         |   61 +-
 drivers/md/bcache/bset.c                           |   56 +-
 drivers/md/bcache/bset.h                           |    4 +
 drivers/md/bcache/btree.c                          |  451 +-
 drivers/md/bcache/btree.h                          |   35 +-
 drivers/md/bcache/closure.c                        |    6 +-
 drivers/md/bcache/debug.c                          |  178 +-
 drivers/md/bcache/debug.h                          |   11 +-
 drivers/md/bcache/io.c                             |   68 +-
 drivers/md/bcache/journal.c                        |   25 +-
 drivers/md/bcache/movinggc.c                       |   24 +-
 drivers/md/bcache/request.c                        |  197 +-
 drivers/md/bcache/request.h                        |    2 +-
 drivers/md/bcache/super.c                          |  171 +-
 drivers/md/bcache/sysfs.c                          |   68 +-
 drivers/md/bcache/trace.c                          |   47 +-
 drivers/md/bcache/util.c                           |   17 -
 drivers/md/bcache/util.h                           |    6 -
 drivers/md/bcache/writeback.c                      |  133 +-
 drivers/md/bcache/writeback.h                      |   64 +
 drivers/net/ethernet/atheros/atl1e/atl1e_main.c    |   24 +-
 drivers/net/ethernet/broadcom/Kconfig              |    1 +
 drivers/net/ethernet/emulex/benet/be_main.c        |   14 +-
 drivers/net/ethernet/mellanox/mlx5/core/debugfs.c  |    2 +-
 drivers/net/hyperv/netvsc_drv.c                    |    4 +-
 drivers/net/macvtap.c                              |   65 +-
 drivers/net/tun.c                                  |   62 +-
 drivers/net/vxlan.c                                |    6 +
 drivers/net/xen-netfront.c                         |   31 +-
 drivers/pnp/pnpacpi/rsparser.c                     |    2 +-
 drivers/pnp/resource.c                             |    1 +
 drivers/s390/cio/qdio_main.c                       |    4 +-
 drivers/s390/crypto/ap_bus.c                       |    1 +
 drivers/staging/Kconfig                            |    2 -
 drivers/staging/Makefile                           |    1 -
 drivers/staging/csr/Kconfig                        |    9 -
 drivers/staging/csr/LICENSE.txt                    |   39 -
 drivers/staging/csr/Makefile                       |   73 -
 drivers/staging/csr/bh.c                           |  404 --
 drivers/staging/csr/csr_framework_ext.c            |   40 -
 drivers/staging/csr/csr_framework_ext.h            |   35 -
 drivers/staging/csr/csr_framework_ext_types.h      |   30 -
 drivers/staging/csr/csr_log.h                      |  223 -
 drivers/staging/csr/csr_log_configure.h            |   39 -
 drivers/staging/csr/csr_log_text.h                 |  124 -
 drivers/staging/csr/csr_macro.h                    |   39 -
 drivers/staging/csr/csr_msg_transport.h            |   17 -
 drivers/staging/csr/csr_msgconv.c                  |  291 -
 drivers/staging/csr/csr_msgconv.h                  |   78 -
 drivers/staging/csr/csr_prim_defs.h                |   55 -
 drivers/staging/csr/csr_result.h                   |   17 -
 drivers/staging/csr/csr_sched.h                    |   85 -
 drivers/staging/csr/csr_sdio.h                     |  723 ---
 .../staging/csr/csr_serialize_primitive_types.c    |  100 -
 drivers/staging/csr/csr_time.c                     |   33 -
 drivers/staging/csr/csr_time.h                     |   76 -
 drivers/staging/csr/csr_util.c                     |   15 -
 drivers/staging/csr/csr_wifi_common.h              |  101 -
 drivers/staging/csr/csr_wifi_fsm.h                 |  240 -
 drivers/staging/csr/csr_wifi_fsm_event.h           |   42 -
 drivers/staging/csr/csr_wifi_fsm_types.h           |  430 --
 drivers/staging/csr/csr_wifi_hip_card.h            |  114 -
 drivers/staging/csr/csr_wifi_hip_card_sdio.c       | 4001 ------------
 drivers/staging/csr/csr_wifi_hip_card_sdio.h       |  694 ---
 drivers/staging/csr/csr_wifi_hip_card_sdio_intr.c  | 2595 --------
 drivers/staging/csr/csr_wifi_hip_card_sdio_mem.c   | 1713 -----
 drivers/staging/csr/csr_wifi_hip_chiphelper.c      |  793 ---
 drivers/staging/csr/csr_wifi_hip_chiphelper.h      |  407 --
 .../staging/csr/csr_wifi_hip_chiphelper_private.h  |  200 -
 drivers/staging/csr/csr_wifi_hip_conversions.h     |   73 -
 drivers/staging/csr/csr_wifi_hip_download.c        |  819 ---
 drivers/staging/csr/csr_wifi_hip_dump.c            |  837 ---
 drivers/staging/csr/csr_wifi_hip_packing.c         | 4804 ---------------
 drivers/staging/csr/csr_wifi_hip_send.c            |  415 --
 drivers/staging/csr/csr_wifi_hip_signals.c         | 1313 ----
 drivers/staging/csr/csr_wifi_hip_signals.h         |  128 -
 drivers/staging/csr/csr_wifi_hip_sigs.h            | 1417 -----
 drivers/staging/csr/csr_wifi_hip_ta_sampling.c     |  541 --
 drivers/staging/csr/csr_wifi_hip_ta_sampling.h     |   66 -
 drivers/staging/csr/csr_wifi_hip_udi.c             |  173 -
 drivers/staging/csr/csr_wifi_hip_unifi.h           |  871 ---
 .../staging/csr/csr_wifi_hip_unifi_signal_names.c  |   41 -
 drivers/staging/csr/csr_wifi_hip_unifi_udi.h       |   52 -
 drivers/staging/csr/csr_wifi_hip_unifihw.h         |   59 -
 drivers/staging/csr/csr_wifi_hip_unifiversion.h    |   30 -
 drivers/staging/csr/csr_wifi_hip_xbv.c             | 1076 ----
 drivers/staging/csr/csr_wifi_hip_xbv.h             |  119 -
 drivers/staging/csr/csr_wifi_hostio_prim.h         |   18 -
 drivers/staging/csr/csr_wifi_lib.h                 |  103 -
 drivers/staging/csr/csr_wifi_msgconv.h             |   49 -
 .../staging/csr/csr_wifi_nme_ap_converter_init.c   |   90 -
 .../staging/csr/csr_wifi_nme_ap_converter_init.h   |   41 -
 .../csr/csr_wifi_nme_ap_free_downstream_contents.c |   84 -
 .../csr/csr_wifi_nme_ap_free_upstream_contents.c   |   39 -
 drivers/staging/csr/csr_wifi_nme_ap_lib.h          |  495 --
 drivers/staging/csr/csr_wifi_nme_ap_prim.h         |  494 --
 drivers/staging/csr/csr_wifi_nme_ap_sef.c          |   30 -
 drivers/staging/csr/csr_wifi_nme_ap_sef.h          |   21 -
 drivers/staging/csr/csr_wifi_nme_ap_serialize.c    |  909 ---
 drivers/staging/csr/csr_wifi_nme_ap_serialize.h    |   94 -
 drivers/staging/csr/csr_wifi_nme_converter_init.h  |   38 -
 drivers/staging/csr/csr_wifi_nme_lib.h             |  991 ---
 drivers/staging/csr/csr_wifi_nme_prim.h            | 1657 -----
 drivers/staging/csr/csr_wifi_nme_serialize.h       |  166 -
 drivers/staging/csr/csr_wifi_nme_task.h            |   27 -
 drivers/staging/csr/csr_wifi_private_common.h      |   81 -
 drivers/staging/csr/csr_wifi_result.h              |   27 -
 .../staging/csr/csr_wifi_router_converter_init.c   |   82 -
 .../staging/csr/csr_wifi_router_converter_init.h   |   34 -
 .../csr/csr_wifi_router_ctrl_converter_init.c      |  134 -
 .../csr/csr_wifi_router_ctrl_converter_init.h      |   34 -
 ...csr_wifi_router_ctrl_free_downstream_contents.c |  108 -
 .../csr_wifi_router_ctrl_free_upstream_contents.c  |   87 -
 drivers/staging/csr/csr_wifi_router_ctrl_lib.h     | 2082 -------
 drivers/staging/csr/csr_wifi_router_ctrl_prim.h    | 2113 -------
 drivers/staging/csr/csr_wifi_router_ctrl_sef.c     |   46 -
 drivers/staging/csr/csr_wifi_router_ctrl_sef.h     |   51 -
 .../staging/csr/csr_wifi_router_ctrl_serialize.c   | 2591 --------
 .../staging/csr/csr_wifi_router_ctrl_serialize.h   |  333 -
 .../csr/csr_wifi_router_free_downstream_contents.c |   53 -
 .../csr/csr_wifi_router_free_upstream_contents.c   |   47 -
 drivers/staging/csr/csr_wifi_router_lib.h          |  417 --
 drivers/staging/csr/csr_wifi_router_prim.h         |  421 --
 drivers/staging/csr/csr_wifi_router_sef.c          |   19 -
 drivers/staging/csr/csr_wifi_router_sef.h          |   25 -
 drivers/staging/csr/csr_wifi_router_serialize.c    |  418 --
 drivers/staging/csr/csr_wifi_router_serialize.h    |   67 -
 drivers/staging/csr/csr_wifi_router_task.h         |   25 -
 drivers/staging/csr/csr_wifi_router_transport.c    |  199 -
 .../csr/csr_wifi_serialize_primitive_types.c       |  256 -
 drivers/staging/csr/csr_wifi_sme_ap_lib.h          |  774 ---
 drivers/staging/csr/csr_wifi_sme_ap_prim.h         | 1030 ----
 drivers/staging/csr/csr_wifi_sme_converter_init.c  |  201 -
 drivers/staging/csr/csr_wifi_sme_converter_init.h  |   34 -
 .../csr/csr_wifi_sme_free_downstream_contents.c    |  187 -
 .../csr/csr_wifi_sme_free_upstream_contents.c      |  275 -
 drivers/staging/csr/csr_wifi_sme_lib.h             | 4303 -------------
 drivers/staging/csr/csr_wifi_sme_prim.h            | 6510 --------------------
 drivers/staging/csr/csr_wifi_sme_sef.c             |   85 -
 drivers/staging/csr/csr_wifi_sme_sef.h             |  142 -
 drivers/staging/csr/csr_wifi_sme_serialize.c       | 5809 -----------------
 drivers/staging/csr/csr_wifi_sme_serialize.h       |  666 --
 drivers/staging/csr/csr_wifi_sme_task.h            |   25 -
 drivers/staging/csr/csr_wifi_vif_utils.h           |   27 -
 drivers/staging/csr/data_tx.c                      |   54 -
 drivers/staging/csr/drv.c                          | 2193 -------
 drivers/staging/csr/firmware.c                     |  396 --
 drivers/staging/csr/inet.c                         |  104 -
 drivers/staging/csr/init_hw.c                      |  108 -
 drivers/staging/csr/io.c                           | 1098 ----
 drivers/staging/csr/mlme.c                         |  433 --
 drivers/staging/csr/monitor.c                      |  384 --
 drivers/staging/csr/netdev.c                       | 3307 ----------
 drivers/staging/csr/os.c                           |  477 --
 drivers/staging/csr/putest.c                       |  685 --
 drivers/staging/csr/sdio_events.c                  |  134 -
 drivers/staging/csr/sdio_mmc.c                     | 1288 ----
 drivers/staging/csr/sdio_stubs.c                   |   82 -
 drivers/staging/csr/sme_blocking.c                 | 1466 -----
 drivers/staging/csr/sme_mgt.c                      | 1012 ---
 drivers/staging/csr/sme_native.c                   |  566 --
 drivers/staging/csr/sme_sys.c                      | 3260 ----------
 drivers/staging/csr/sme_userspace.c                |  315 -
 drivers/staging/csr/sme_userspace.h                |   38 -
 drivers/staging/csr/sme_wext.c                     | 3327 ----------
 drivers/staging/csr/ul_int.c                       |  528 --
 drivers/staging/csr/unifi_clients.h                |  129 -
 drivers/staging/csr/unifi_config.h                 |   34 -
 drivers/staging/csr/unifi_dbg.c                    |  110 -
 drivers/staging/csr/unifi_event.c                  |  692 ---
 drivers/staging/csr/unifi_native.h                 |  257 -
 drivers/staging/csr/unifi_os.h                     |  122 -
 drivers/staging/csr/unifi_pdu_processing.c         | 3729 -----------
 drivers/staging/csr/unifi_priv.h                   | 1136 ----
 drivers/staging/csr/unifi_sme.c                    | 1225 ----
 drivers/staging/csr/unifi_sme.h                    |  245 -
 drivers/staging/csr/unifi_wext.h                   |  108 -
 drivers/staging/csr/unifiio.h                      |  398 --
 drivers/staging/csr/wext_events.c                  |  283 -
 drivers/staging/iio/accel/lis3l02dq_core.c         |    2 +
 drivers/staging/iio/adc/ad7291.c                   |    1 +
 drivers/staging/iio/adc/mxs-lradc.c                |   18 +-
 drivers/thermal/x86_pkg_temp_thermal.c             |   18 +-
 drivers/vhost/net.c                                |   37 +-
 drivers/vhost/scsi.c                               |   17 +-
 drivers/vhost/test.c                               |    6 +-
 drivers/vhost/vhost.h                              |   10 +-
 fs/btrfs/extent-tree.c                             |   27 +-
 fs/btrfs/scrub.c                                   |    2 +-
 fs/ext3/namei.c                                    |    2 +-
 fs/ext4/extents.c                                  |   23 +-
 fs/ext4/extents_status.c                           |   51 +-
 fs/ext4/inode.c                                    |    7 +-
 fs/ext4/namei.c                                    |    2 +-
 fs/fuse/dir.c                                      |   51 +-
 fs/nfs/nfs4xdr.c                                   |   21 +-
 fs/open.c                                          |    2 +
 fs/proc/vmcore.c                                   |    2 +-
 fs/super.c                                         |   25 +-
 include/acpi/acpixf.h                              |    1 +
 include/acpi/actypes.h                             |   15 +
 include/acpi/video.h                               |   11 +-
 include/drm/drm_dp_helper.h                        |   31 +-
 include/drm/drm_mm.h                               |    6 +-
 include/linux/acpi.h                               |    1 +
 include/linux/dcache.h                             |    2 +-
 include/linux/drbd.h                               |    6 +-
 include/linux/drbd_genl.h                          |    2 +
 include/linux/drbd_limits.h                        |    9 +
 include/linux/if_vlan.h                            |    3 +-
 include/linux/iio/iio.h                            |    4 +-
 include/linux/pm_wakeup.h                          |    4 +-
 include/trace/events/bcache.h                      |  381 +-
 include/trace/ftrace.h                             |    4 -
 include/uapi/asm-generic/fcntl.h                   |    4 +-
 include/uapi/drm/i915_drm.h                        |   24 +
 include/xen/interface/io/blkif.h                   |   53 +
 include/xen/interface/io/ring.h                    |    5 +
 kernel/power/autosleep.c                           |    3 +-
 kernel/trace/ring_buffer.c                         |   26 +-
 kernel/trace/trace.c                               |   34 +-
 kernel/trace/trace.h                               |   10 +-
 kernel/trace/trace_event_perf.c                    |   10 +-
 kernel/trace/trace_events.c                        |   98 +-
 kernel/trace/trace_events_filter.c                 |    4 +-
 kernel/trace/trace_functions.c                     |    2 +-
 kernel/trace/trace_functions_graph.c               |   54 +-
 kernel/trace/trace_kprobe.c                        |   29 +-
 kernel/trace/trace_mmiotrace.c                     |    8 +-
 kernel/trace/trace_output.c                        |   14 +-
 kernel/trace/trace_syscalls.c                      |   26 +-
 kernel/trace/trace_uprobe.c                        |    2 -
 kernel/wait.c                                      |    3 +-
 lib/mpi/longlong.h                                 |   17 +-
 net/8021q/vlan_core.c                              |    2 +-
 net/8021q/vlan_dev.c                               |    7 +
 net/core/dev.c                                     |   11 +-
 net/core/ethtool.c                                 |   30 +-
 net/ethernet/eth.c                                 |   21 +-
 net/ipv4/ip_input.c                                |    7 +-
 net/ipv6/ndisc.c                                   |    6 +-
 net/irda/irlan/irlan_eth.c                         |   31 +-
 net/sched/sch_qfq.c                                |   85 +-
 net/sunrpc/clnt.c                                  |    1 +
 382 files changed, 9673 insertions(+), 97332 deletions(-)
 create mode 100644 Documentation/ABI/testing/sysfs-driver-xen-blkback
 create mode 100644 Documentation/ABI/testing/sysfs-driver-xen-blkfront
 create mode 100644 drivers/gpu/drm/i915/i915_gpu_error.c
 create mode 100644 drivers/gpu/drm/i915/intel_uncore.c
 create mode 100644 drivers/md/bcache/writeback.h
 delete mode 100644 drivers/staging/csr/Kconfig
 delete mode 100644 drivers/staging/csr/LICENSE.txt
 delete mode 100644 drivers/staging/csr/Makefile
 delete mode 100644 drivers/staging/csr/bh.c
 delete mode 100644 drivers/staging/csr/csr_framework_ext.c
 delete mode 100644 drivers/staging/csr/csr_framework_ext.h
 delete mode 100644 drivers/staging/csr/csr_framework_ext_types.h
 delete mode 100644 drivers/staging/csr/csr_log.h
 delete mode 100644 drivers/staging/csr/csr_log_configure.h
 delete mode 100644 drivers/staging/csr/csr_log_text.h
 delete mode 100644 drivers/staging/csr/csr_macro.h
 delete mode 100644 drivers/staging/csr/csr_msg_transport.h
 delete mode 100644 drivers/staging/csr/csr_msgconv.c
 delete mode 100644 drivers/staging/csr/csr_msgconv.h
 delete mode 100644 drivers/staging/csr/csr_prim_defs.h
 delete mode 100644 drivers/staging/csr/csr_result.h
 delete mode 100644 drivers/staging/csr/csr_sched.h
 delete mode 100644 drivers/staging/csr/csr_sdio.h
 delete mode 100644 drivers/staging/csr/csr_serialize_primitive_types.c
 delete mode 100644 drivers/staging/csr/csr_time.c
 delete mode 100644 drivers/staging/csr/csr_time.h
 delete mode 100644 drivers/staging/csr/csr_util.c
 delete mode 100644 drivers/staging/csr/csr_wifi_common.h
 delete mode 100644 drivers/staging/csr/csr_wifi_fsm.h
 delete mode 100644 drivers/staging/csr/csr_wifi_fsm_event.h
 delete mode 100644 drivers/staging/csr/csr_wifi_fsm_types.h
 delete mode 100644 drivers/staging/csr/csr_wifi_hip_card.h
 delete mode 100644 drivers/staging/csr/csr_wifi_hip_card_sdio.c
 delete mode 100644 drivers/staging/csr/csr_wifi_hip_card_sdio.h
 delete mode 100644 drivers/staging/csr/csr_wifi_hip_card_sdio_intr.c
 delete mode 100644 drivers/staging/csr/csr_wifi_hip_card_sdio_mem.c
 delete mode 100644 drivers/staging/csr/csr_wifi_hip_chiphelper.c
 delete mode 100644 drivers/staging/csr/csr_wifi_hip_chiphelper.h
 delete mode 100644 drivers/staging/csr/csr_wifi_hip_chiphelper_private.h
 delete mode 100644 drivers/staging/csr/csr_wifi_hip_conversions.h
 delete mode 100644 drivers/staging/csr/csr_wifi_hip_download.c
 delete mode 100644 drivers/staging/csr/csr_wifi_hip_dump.c
 delete mode 100644 drivers/staging/csr/csr_wifi_hip_packing.c
 delete mode 100644 drivers/staging/csr/csr_wifi_hip_send.c
 delete mode 100644 drivers/staging/csr/csr_wifi_hip_signals.c
 delete mode 100644 drivers/staging/csr/csr_wifi_hip_signals.h
 delete mode 100644 drivers/staging/csr/csr_wifi_hip_sigs.h
 delete mode 100644 drivers/staging/csr/csr_wifi_hip_ta_sampling.c
 delete mode 100644 drivers/staging/csr/csr_wifi_hip_ta_sampling.h
 delete mode 100644 drivers/staging/csr/csr_wifi_hip_udi.c
 delete mode 100644 drivers/staging/csr/csr_wifi_hip_unifi.h
 delete mode 100644 drivers/staging/csr/csr_wifi_hip_unifi_signal_names.c
 delete mode 100644 drivers/staging/csr/csr_wifi_hip_unifi_udi.h
 delete mode 100644 drivers/staging/csr/csr_wifi_hip_unifihw.h
 delete mode 100644 drivers/staging/csr/csr_wifi_hip_unifiversion.h
 delete mode 100644 drivers/staging/csr/csr_wifi_hip_xbv.c
 delete mode 100644 drivers/staging/csr/csr_wifi_hip_xbv.h
 delete mode 100644 drivers/staging/csr/csr_wifi_hostio_prim.h
 delete mode 100644 drivers/staging/csr/csr_wifi_lib.h
 delete mode 100644 drivers/staging/csr/csr_wifi_msgconv.h
 delete mode 100644 drivers/staging/csr/csr_wifi_nme_ap_converter_init.c
 delete mode 100644 drivers/staging/csr/csr_wifi_nme_ap_converter_init.h
 delete mode 100644 drivers/staging/csr/csr_wifi_nme_ap_free_downstream_contents.c
 delete mode 100644 drivers/staging/csr/csr_wifi_nme_ap_free_upstream_contents.c
 delete mode 100644 drivers/staging/csr/csr_wifi_nme_ap_lib.h
 delete mode 100644 drivers/staging/csr/csr_wifi_nme_ap_prim.h
 delete mode 100644 drivers/staging/csr/csr_wifi_nme_ap_sef.c
 delete mode 100644 drivers/staging/csr/csr_wifi_nme_ap_sef.h
 delete mode 100644 drivers/staging/csr/csr_wifi_nme_ap_serialize.c
 delete mode 100644 drivers/staging/csr/csr_wifi_nme_ap_serialize.h
 delete mode 100644 drivers/staging/csr/csr_wifi_nme_converter_init.h
 delete mode 100644 drivers/staging/csr/csr_wifi_nme_lib.h
 delete mode 100644 drivers/staging/csr/csr_wifi_nme_prim.h
 delete mode 100644 drivers/staging/csr/csr_wifi_nme_serialize.h
 delete mode 100644 drivers/staging/csr/csr_wifi_nme_task.h
 delete mode 100644 drivers/staging/csr/csr_wifi_private_common.h
 delete mode 100644 drivers/staging/csr/csr_wifi_result.h
 delete mode 100644 drivers/staging/csr/csr_wifi_router_converter_init.c
 delete mode 100644 drivers/staging/csr/csr_wifi_router_converter_init.h
 delete mode 100644 drivers/staging/csr/csr_wifi_router_ctrl_converter_init.c
 delete mode 100644 drivers/staging/csr/csr_wifi_router_ctrl_converter_init.h
 delete mode 100644 drivers/staging/csr/csr_wifi_router_ctrl_free_downstream_contents.c
 delete mode 100644 drivers/staging/csr/csr_wifi_router_ctrl_free_upstream_contents.c
 delete mode 100644 drivers/staging/csr/csr_wifi_router_ctrl_lib.h
 delete mode 100644 drivers/staging/csr/csr_wifi_router_ctrl_prim.h
 delete mode 100644 drivers/staging/csr/csr_wifi_router_ctrl_sef.c
 delete mode 100644 drivers/staging/csr/csr_wifi_router_ctrl_sef.h
 delete mode 100644 drivers/staging/csr/csr_wifi_router_ctrl_serialize.c
 delete mode 100644 drivers/staging/csr/csr_wifi_router_ctrl_serialize.h
 delete mode 100644 drivers/staging/csr/csr_wifi_router_free_downstream_contents.c
 delete mode 100644 drivers/staging/csr/csr_wifi_router_free_upstream_contents.c
 delete mode 100644 drivers/staging/csr/csr_wifi_router_lib.h
 delete mode 100644 drivers/staging/csr/csr_wifi_router_prim.h
 delete mode 100644 drivers/staging/csr/csr_wifi_router_sef.c
 delete mode 100644 drivers/staging/csr/csr_wifi_router_sef.h
 delete mode 100644 drivers/staging/csr/csr_wifi_router_serialize.c
 delete mode 100644 drivers/staging/csr/csr_wifi_router_serialize.h
 delete mode 100644 drivers/staging/csr/csr_wifi_router_task.h
 delete mode 100644 drivers/staging/csr/csr_wifi_router_transport.c
 delete mode 100644 drivers/staging/csr/csr_wifi_serialize_primitive_types.c
 delete mode 100644 drivers/staging/csr/csr_wifi_sme_ap_lib.h
 delete mode 100644 drivers/staging/csr/csr_wifi_sme_ap_prim.h
 delete mode 100644 drivers/staging/csr/csr_wifi_sme_converter_init.c
 delete mode 100644 drivers/staging/csr/csr_wifi_sme_converter_init.h
 delete mode 100644 drivers/staging/csr/csr_wifi_sme_free_downstream_contents.c
 delete mode 100644 drivers/staging/csr/csr_wifi_sme_free_upstream_contents.c
 delete mode 100644 drivers/staging/csr/csr_wifi_sme_lib.h
 delete mode 100644 drivers/staging/csr/csr_wifi_sme_prim.h
 delete mode 100644 drivers/staging/csr/csr_wifi_sme_sef.c
 delete mode 100644 drivers/staging/csr/csr_wifi_sme_sef.h
 delete mode 100644 drivers/staging/csr/csr_wifi_sme_serialize.c
 delete mode 100644 drivers/staging/csr/csr_wifi_sme_serialize.h
 delete mode 100644 drivers/staging/csr/csr_wifi_sme_task.h
 delete mode 100644 drivers/staging/csr/csr_wifi_vif_utils.h
 delete mode 100644 drivers/staging/csr/data_tx.c
 delete mode 100644 drivers/staging/csr/drv.c
 delete mode 100644 drivers/staging/csr/firmware.c
 delete mode 100644 drivers/staging/csr/inet.c
 delete mode 100644 drivers/staging/csr/init_hw.c
 delete mode 100644 drivers/staging/csr/io.c
 delete mode 100644 drivers/staging/csr/mlme.c
 delete mode 100644 drivers/staging/csr/monitor.c
 delete mode 100644 drivers/staging/csr/netdev.c
 delete mode 100644 drivers/staging/csr/os.c
 delete mode 100644 drivers/staging/csr/putest.c
 delete mode 100644 drivers/staging/csr/sdio_events.c
 delete mode 100644 drivers/staging/csr/sdio_mmc.c
 delete mode 100644 drivers/staging/csr/sdio_stubs.c
 delete mode 100644 drivers/staging/csr/sme_blocking.c
 delete mode 100644 drivers/staging/csr/sme_mgt.c
 delete mode 100644 drivers/staging/csr/sme_native.c
 delete mode 100644 drivers/staging/csr/sme_sys.c
 delete mode 100644 drivers/staging/csr/sme_userspace.c
 delete mode 100644 drivers/staging/csr/sme_userspace.h
 delete mode 100644 drivers/staging/csr/sme_wext.c
 delete mode 100644 drivers/staging/csr/ul_int.c
 delete mode 100644 drivers/staging/csr/unifi_clients.h
 delete mode 100644 drivers/staging/csr/unifi_config.h
 delete mode 100644 drivers/staging/csr/unifi_dbg.c
 delete mode 100644 drivers/staging/csr/unifi_event.c
 delete mode 100644 drivers/staging/csr/unifi_native.h
 delete mode 100644 drivers/staging/csr/unifi_os.h
 delete mode 100644 drivers/staging/csr/unifi_pdu_processing.c
 delete mode 100644 drivers/staging/csr/unifi_priv.h
 delete mode 100644 drivers/staging/csr/unifi_sme.c
 delete mode 100644 drivers/staging/csr/unifi_sme.h
 delete mode 100644 drivers/staging/csr/unifi_wext.h
 delete mode 100644 drivers/staging/csr/unifiio.h
 delete mode 100644 drivers/staging/csr/wext_events.c
Signature · 3 lines
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
maintainer
#1 lore raw
Quoted 1 line · Daniel Vetter

Hi Dave,

Okay since I missed this, then I merged patches from the list from David Herrmann
fixing up drm_mm usage, then I merged this and it all fell to pieces.

CC [M] drivers/gpu/drm/i915/i915_gem_gtt.o
CC [M] drivers/gpu/drm/i915/i915_gem_stolen.o
/home/airlied/devel/kernel/drm-next/drivers/gpu/drm/i915/i915_gem_stolen.c:
In function ‘i915_gem_object_create_stolen_for_preallocated’:
/home/airlied/devel/kernel/drm-next/drivers/gpu/drm/i915/i915_gem_stolen.c:426:2:
error: implicit declaration of function ‘drm_mm_put_block’ [-Werror=implicit-function-declaration]
drm_mm_put_block(stolen);
^
cc1: some warnings being treated as errors

Smash a patch on top of this if you like or whatever you it is you want.

Dave.

Quoted 1,204 lines

Neat that QA (and Ben) keeps on humming along while I'm on vacation, so you already get the next feature pull request:
- proper eLLC support for HSW from Ben
- more interrupt refactoring
- add w/a tags where we implement them already (Damien)
- hangcheck fixes (Chris) + hangcheck stats (Mika)
- flesh out the new vm structs for ppgtt and ggtt (Ben)
- PSR for Haswell, still disabled by default (Rodrigo et al.)
- pc8+ refclock sequence code from Paulo
- more interrupt refactoring from Paulo, unifying ilk/snb with the ivb/hsw interrupt code
- full solution for the Haswell concurrent reg access issues (Chris)
- fix racy object accounting, used by some new leak tests
- fix sync polarity settings on ch7xxx dvo encoder
- random bits&pieces, little fixes and better debug output all over

QA had a bit a regression-fest due to the PSR support - obviously not disabled-by-default hard enough ;-) Hence I've smashed the fix from Chris on top (which is thanks to Ben already confirmed by QA to make stuff work again).

Note that I've had to backmerge from Linus tree to resolve a few issues, hence why the pull request is this large. I've added the shortlog of just the non-upstream changes.

Cheers, Daniel

The following changes since commit ee114b97e67b2a572f94982567a21ac4ee17c133:

Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (2013-07-18 17:39:05 -0700)

are available in the git repository at:

git://people.freedesktop.org/~danvet/drm-intel tags/drm-intel-next-2013-07-26-fixed

for you to fetch changes up to cd234b0bfd5ab012e42274b24aae420fa1823d58:

drm/i915: Do not dereference NULL crtc or fb until after checking (2013-08-04 21:13:43 +0200)

----------------------------------------------------------------
Shortlog of the non-upstream patches (real pull request log further down):

Ben Widawsky (12):
drm/i915/hsw: Set correct Haswell PTE encodings. drm/i915: Define some of the eLLC magic drm/i915: store eLLC size
drm/i915: Use eLLC/LLC by default when available drm/i915: debugfs entries for [e]LLC
drm/i915: Move gtt and ppgtt under address space umbrella drm/i915: Put the mm in the parent address space drm/i915: Create a global list of vms
drm/i915: Move active/inactive lists to new mm drm/i915: Free stolen node on failed preallocation drm/i915: Create VMAs
drm/i915: Make i915 events part of uapi

Chris Wilson (12):
drm/i915: Fix retrieval of hangcheck stats
drm/i915: Replace open-coding of DEFAULT_CONTEXT_ID
drm/i915: Add some debug breadcrumbs to connector detection drm/i915: Use Graphics Base of Stolen Memory on all gen3+ drm/i915: Colocate all GT access routines in the same file drm/i915: Use a private interface for register access within GT drm/i915: Use the common register access functions for NOTRACE variants drm/i915: Squash gen lookup through multiple indirections inside GT access drm/i915: Convert the register access tracepoint to be conditional drm/i915: Retry DP aux_ch communications with a different clock after failure drm/i915: Replace open-coded offset_in_page()
drm/i915: Do not dereference NULL crtc or fb until after checking

Damien Lespiau (5):
drm/i915: We implement WaFbcWaitForVBlankBeforeEnable for ilk and snb drm/i915: We implement WaFbcAsynchFlipDisableFbcQueue on ilk and snb drm/i915: We implement WaFbcDisableDpfcClockGating on ilk drm/i915: We implement WaMPhyProgramming on Haswell drm/i915: Don't try to calculate RC6 residency on GEN4 and before

Dan Carpenter (2):
drm/i915: checking for NULL instead of IS_ERR() drm/i915: use after free on error path

Daniel Vetter (10):
drm/i915: unify PM interrupt preinstall sequence
drm/i915: unify GT/PM irq postinstall code
drm/i915: extract rps interrupt enable/disable helpers
drm/i915: simplify rps interrupt enabling/disabling sequence
drm/i915: fix up error cleanup in i915_gem_object_bind_to_gtt
drm/i915: disable stolen mem for OVERLAY_NEEDS_PHYSICAL
drm/i915: fix reference counting in i915_gem_create
Merge commit 'Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux'
drm/i915: fix the racy object accounting
drm/i915: fix pnv display core clock readout out

Egbert Eich (1):
drm/i915: Add messages useful for HPD storm detection debugging (v2)

Imre Deak (2):
drm/i915: restore debug message lost in merge resolution drm/i915: dvo_ch7xxx: fix vsync polarity setting

Mika Kuoppala (1):
drm/i915: introduce i915_queue_hangcheck

Paulo Zanoni (16):
drm/i915: remove SDV support from lpt_pch_init_refclk drm/i915: extract FDI mPHY functions from lpt_init_pch_refclk drm/i915: extract lpt_enable_clkout_dp from lpt_init_pch_refclk drm/i915: kill ivybridge_irq_preinstall
drm/i915: extract ilk_display_irq_handler
drm/i915: extract ivb_display_irq_handler
drm/i915: don't read or write GEN6_PMIIR on Gen 5 drm/i915: reorganize ironlake_irq_handler
drm/i915: POSTING_READ(DEIER) on ivybridge_irq_handler drm/i915: add ILK/SNB support to ivybridge_irq_handler drm/i915: kill Ivybridge vblank irq vfuncs
drm/i915: kill ivybridge_irq_postinstall
drm/i915: invert {ilk, snb}_gt_irq_handler check drm/i915: extend lpt_enable_clkout_dp
drm/i915: disable CLKOUT_DP when it's not needed drm/i915: add functions to disable and restore LCPLL

Rodrigo Vivi (7):
drm/i915: split aux_clock_divider logic in a separated function for reuse. drm/i915: Enable/Disable PSR
drm/i915: Added debugfs support for PSR Status
drm/i915: Match all PSR mode entry conditions before enabling it. drm/intel: add enable_psr module option and disable psr by default drm/i915: add update function to disable/enable-back PSR drm/i915: Hook PSR functionality

Shobhit Kumar (2):
drm: Added SDP and VSC structures for handling PSR for eDP drm/i915: Read the EDP DPCD and PSR Capability

Xiong Zhang (1):
drm/i915: add prefault_disable module option

----------------------------------------------------------------
Aaro Koskinen (1):
MIPS: tlbex: fix broken build in v3.11-rc1

Aaron Lu (2):
ACPICA: expose OSI version
ACPI / video: no automatic brightness changes by win8-compatible firmware

Al Viro (2):
allow O_TMPFILE to work with O_WRONLY
livelock avoidance in sget()

Alexander Z Lam (2):
tracing: Fix error handling to ensure instances can always be removed
tracing: Miscellaneous fixes for trace_array ref counting

Alexandre Belloni (2):
iio: Fix iio_channel_has_info
iio: inkern: fix iio_convert_raw_to_processed_unlocked

Andreas Gruenbacher (2):
drbd: Do not sleep inside rcu
drbd: Fix rcu_read_lock balance on error path

Asias He (3):

      vhost-net: Always access vq->private_data under vq mutex
      vhost-scsi: Always access vq->private_data under vq mutex
      vhost: Remove custom vhost rcu usage

Ben Skeggs (4):
Merge remote-tracking branch 'airlied/drm-next' into drm-nouveau-next drm/nouveau: fix locking issues in page flipping paths drm/nv50/kms: fix pin refcnt leaks
drm/nouveau: use dedicated channel for async moves on GT/GF chipsets.

Ben Widawsky (12):
drm/i915/hsw: Set correct Haswell PTE encodings. drm/i915: Define some of the eLLC magic drm/i915: store eLLC size
drm/i915: Use eLLC/LLC by default when available drm/i915: debugfs entries for [e]LLC
drm/i915: Move gtt and ppgtt under address space umbrella drm/i915: Put the mm in the parent address space drm/i915: Create a global list of vms
drm/i915: Move active/inactive lists to new mm drm/i915: Free stolen node on failed preallocation drm/i915: Create VMAs
drm/i915: Make i915 events part of uapi

Catalin Marinas (1):
arm64: Only enable local interrupts after the CPU is marked online

Chanwoo Choi (1):
PM / Sleep: Fix comment typo in pm_wakeup.h

Chen Gang (3):
arm64: add '#ifdef CONFIG_COMPAT' for aarch32_break_handler()
alpha: kernel: using memcpy() instead of strcpy()
alpha: kernel: typo issue, using '1' instead of '11'

Chris Wilson (14):
drm/i915: Fix retrieval of hangcheck stats
drm/i915: Replace open-coding of DEFAULT_CONTEXT_ID
drm/i915: Fix dereferencing invalid connectors in is_crtc_connector_off() drm/i915: Serialize almost all register access
drm/i915: Add some debug breadcrumbs to connector detection drm/i915: Use Graphics Base of Stolen Memory on all gen3+ drm/i915: Colocate all GT access routines in the same file drm/i915: Use a private interface for register access within GT drm/i915: Use the common register access functions for NOTRACE variants drm/i915: Squash gen lookup through multiple indirections inside GT access drm/i915: Convert the register access tracepoint to be conditional drm/i915: Retry DP aux_ch communications with a different clock after failure drm/i915: Replace open-coded offset_in_page()
drm/i915: Do not dereference NULL crtc or fb until after checking

Damien Lespiau (5):
drm/i915: We implement WaFbcWaitForVBlankBeforeEnable for ilk and snb drm/i915: We implement WaFbcAsynchFlipDisableFbcQueue on ilk and snb drm/i915: We implement WaFbcDisableDpfcClockGating on ilk drm/i915: We implement WaMPhyProgramming on Haswell drm/i915: Don't try to calculate RC6 residency on GEN4 and before

Dan Carpenter (3):
bcache: check for allocation failures drm/i915: checking for NULL instead of IS_ERR() drm/i915: use after free on error path

Daniel Baluta (1):
ndisc: bool initializations should use true and false

Daniel Vetter (17):
drm/i915: fix up readout of the lvds dither bit on gen2/3
drm/i915: fix pfit regression for non-autoscaled resolutions
drm/i915: unify PM interrupt preinstall sequence
drm/i915: unify GT/PM irq postinstall code
drm/i915: extract rps interrupt enable/disable helpers
drm/i915: simplify rps interrupt enabling/disabling sequence
drm/i915: Sanitize shared dpll state
Merge tag 'v3.10' into drm-intel-fixes
drm/i915: correctly restore fences with objects attached
drm/i915: fix up gt init sequence fallout
drm/crtc-helper: explicit DPMS on after modeset
drm/i915: fix up error cleanup in i915_gem_object_bind_to_gtt
drm/i915: disable stolen mem for OVERLAY_NEEDS_PHYSICAL
drm/i915: fix reference counting in i915_gem_create
Merge commit 'Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux'
drm/i915: fix the racy object accounting
drm/i915: fix pnv display core clock readout out

Dave Airlie (2):
Merge branch 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6
Merge tag 'drm-intel-fixes-2013-07-22' of git://people.freedesktop.org/~danvet/drm-intel into drm-fixes

David Howells (1):

      Fix __wait_on_atomic_t() to call the action func if the counter != 0

David S. Miller (1):
net: Fix sysfs_format_mac() code duplication.

Dragos Foianu (2):
ethtool: fixed trailing statements in ethtool net/irda: fixed style issues in irlan_eth

Egbert Eich (1):
drm/i915: Add messages useful for HPD storm detection debugging (v2)

Eric Dumazet (3):
ipv4: set transport header earlier
vlan: mask vlan prio bits
vlan: fix a race in egress prio management

Faidon Liambotis (1):
MIPS: Octeon: Fix DT pruning bug with pip ports

Florian Fainelli (1):
MIPS: BMIPS: Fix thinko to release slave TP from reset

Gabriel de Perthuis (4):
bcache: Warn when a device is already registered.
bcache: Send a uevent with a cached device's UUID
bcache: Send label uevents
bcache: Refresh usage docs

Ganesan Ramalingam (1):
MIPS: Netlogic: Fix USB block's coherent DMA mask

Greg Kroah-Hartman (2):
staging: csr: remove driver
Merge tag 'iio-fixes-for-3.11a' of git://git.kernel.org/.../jic23/iio into staging-linus

Haiyang Zhang (1):
hyperv: Fix the NETIF_F_SG flag setting in netvsc

Hauke Mehrtens (1):
bgmac: add dependency to phylib

Heiko Carstens (4):
s390/bpf,jit: call module_free() from any context s390/bpf,jit: use generic jit dumper s390/bpf,jit: address randomize and write protect jit code s390/bpf,jit: add pkt_type support

Imre Deak (2):
drm/i915: restore debug message lost in merge resolution drm/i915: dvo_ch7xxx: fix vsync polarity setting

Ingo Tuchscherer (1):
s390/zcrypt: Alias for new zcrypt device driver base module

Jacek Anaszewski (1):
iio: lps331ap: Fix wrong in_pressure_scale output value

James Hogan (1):
MIPS: KVM: Mark KVM_GUEST (T&E KVM) as BROKEN_ON_SMP

Jan Beulich (2):
xen/io/ring.h: new macro to detect whether there are too many requests on the ring
xen-netfront: pull on receive skb may need to happen earlier

Jason Wang (4):
macvtap: fix the missing ret value of TUNSETQUEUE
macvtap: do not assume 802.1Q when send vlan packets
tuntap: do not zerocopy if iov needs more pages than MAX_SKB_FRAGS
macvtap: do not zerocopy if iov needs more pages than MAX_SKB_FRAGS

Javier Martinez Canillas (3):
gpio/omap: don't create an IRQ mapping for every GPIO on DT gpio/omap: auto request GPIO as input if used as IRQ via DT gpio/omap: fix build error when OF_GPIO is not defined.

Jayachandran C (1):
MIPS: Netlogic: Add XLP PIC irqdomain

Jens Axboe (4):
Merge branch 'stable/for-jens-3.10' of git://git.kernel.org/.../konrad/xen into for-3.11/drivers Merge tag 'v3.10-rc7' into for-3.11/drivers
Merge branch 'bcache-for-3.11' of git://evilpiepirate.org/~kent/linux-bcache into for-3.11/drivers Merge branch 'bcache-for-3.11' of git://evilpiepirate.org/~kent/linux-bcache into for-3.11/drivers

Joe Perches (1):
alpha: Convert print_symbol to %pSR

Jonathan Cameron (1):

      iio:trigger: device_unregister->device_del to avoid double free

Josef Bacik (3):
Btrfs: update drop progress before stopping snapshot dropping
Btrfs: fix lock leak when resuming snapshot deletion
Btrfs: re-add root to dead root list if we stop dropping it

Kamal Mostafa (1):
drm/i915: quirk no PCH_PWM_ENABLE for Dell XPS13 backlight

Kent Overstreet (21):
bcache: fix a spurious gcc complaint, use scnprintf
bcache: Convert allocator thread to kthread
bcache: Refactor btree io
bcache: Fix/revamp tracepoints
bcache: Rip out pkey()/pbtree()
bcache: Improve lazy sorting
bcache: Initialize sectors_dirty when attaching
bcache: Track dirty data by stripe
bcache: Write out full stripes
bcache: FUA fixes
bcache: Document shrinker reserve better
bcache: Delete fuzz tester
bcache: Update email address
bcache: Use standard utility code
bcache: Fix a dumb race
bcache: Advertise that flushes are supported
bcache: Fix a sysfs splat on shutdown
bcache: Shutdown fix
bcache: Journal replay fix
bcache: Fix GC_SECTORS_USED() calculation
bcache: Allocation kthread fixes

Konrad Rzeszutek Wilk (4):
xen-blkfront: Introduce a 'max' module parameter to alter the amount of indirect segments. xen-blkback/sysfs: Move the parameters for the persistent grant features xen/blkback: Check device permissions before allowing OP_DISCARD xen/blkback: Check for insane amounts of request on the ring (v6).

Konstantin Khlebnikov (1):
drm/i915: fix long-standing SNB regression in power consumption after resume v2

Kumar Amit Mehta (1):
md: bcache: io.c: fix a potential NULL pointer dereference

Lan Tianyu (1):
ACPI / video: ignore BIOS initial backlight value for Fujitsu E753

Linus Torvalds (23):
Merge git://git.kernel.org/.../davem/net
Merge tag 'pm+acpi-3.11-rc2' of git://git.kernel.org/.../rafael/linux-pm
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm
Merge branch 'for-linus' of git://git.kernel.org/.../s390/linux
Merge tag 'arm64-stable' of git://git.kernel.org/.../cmarinas/linux-aarch64
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
Merge branch 'for-linus' of git://git.kernel.org/.../rw/uml
Merge branch 'for-linus' of git://git.kernel.org/.../josef/btrfs-next
Merge tag 'nfs-for-3.11-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs
Merge tag 'ext4_for_linus' of git://git.kernel.org/.../tytso/ext4
Merge branch 'for-linus' of git://git.kernel.org/.../viro/vfs
Merge tag 'staging-3.11-rc2' of git://git.kernel.org/.../gregkh/staging
Merge tag 'ext4_for_linus' of git://git.kernel.org/.../tytso/ext4
Merge tag 'acpi-video-3.11' of git://git.kernel.org/.../rafael/linux-pm
Linux 3.11-rc2
Merge branch 'for-3.11/drivers' of git://git.kernel.dk/linux-block
Merge tag 'gpio-for-v3.11-2' of git://git.kernel.org/.../linusw/linux-gpio
Merge branch 'next' of git://git.kernel.org/.../rzhang/linux
Merge tag 'trace-3.11-rc2' of git://git.kernel.org/.../rostedt/linux-trace
Merge branch 'for-linus' of git://git.kernel.org/.../mszeredi/fuse
Merge tag 'for_linus' of git://git.kernel.org/.../mst/vhost
Merge branch 'for-linus' of git://git.kernel.org/.../mattst88/alpha
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux

Liu ShuoX (2):
PM / Sleep: avoid 'autosleep' in shutdown progress PNP / ACPI: avoid garbage in resource name

Maarten Lankhorst (5):
drm/nouveau: fix some error-path leaks in fbcon handling code drm/nouveau: do not unpin in nouveau_gem_object_del drm/nouveau: bump fence timeout to 15 seconds drm/nouveau: add falcon interrupt handler drm/nouveau: do not allow negative sizes for now

Marc Zyngier (1):
arm64: use common reboot infrastructure

Marek Vasut (2):
iio: mxs-lradc: Fix misuse of iio->trig
iio: mxs-lradc: Remove useless check in read_raw

Markos Chandras (1):
MIPS: kvm: Kconfig: Drop HAVE_KVM dependency from VIRTUALIZATION

Masami Hiramatsu (1):
tracing/kprobe: Wait for disabling all running kprobe handlers

Masanari Iida (1):
doc: Fix typo in documentation/bcache.txt

Matthew Garrett (1):
ACPI / video: Always call acpi_video_init_brightness() on init

Michael Holzheu (2):
s390/kdump: Disable mmap for s390
s390/kdump: Allow copy_oldmem_page() copy to virtual memory

Michael Mueller (1):
s390/ptrace: PTRACE_TE_ABORT_RAND

Mika Kuoppala (1):
drm/i915: introduce i915_queue_hangcheck

Miklos Szeredi (4):
fuse: readdirplus: sanity checks
fuse: readdirplus: fix instantiate
fuse: readdirplus: change attributes once
fuse: readdirplus: cleanup

Neil Horman (1):
atl1e: unmap partially mapped skb on dma error and free skb

Niels de Vos (1):
fuse: readdirplus: fix dentry leak

Oleg Nesterov (7):
tracing/function: Avoid perf_trace_buf_*() if event_function.perf_events is empty tracing/syscall: Avoid perf_trace_buf_*() if sys_data->perf_events is empty tracing/perf: Move the PERF_MAX_TRACE_SIZE check into perf_trace_buf_prepare()
tracing: Simplify the iteration logic in f_start/f_next
tracing: Do not (ab)use trace_seq in event_id_read()
tracing: Kill trace_array->waiter
tracing: Kill the unbalanced tr->ref++ in tracing_buffers_open()

Paolo Valente (1):
pkt_sched: sch_qfq: remove a source of high packet delay/jitter

Paul Bolle (2):
cpufreq: s3c24xx: rename CONFIG_CPU_FREQ_S3C24XX_DEBUGFS
cpufreq: s3c24xx: fix "depends on ARM_S3C24XX" in Kconfig

Paulo Zanoni (16):
drm/i915: remove SDV support from lpt_pch_init_refclk drm/i915: extract FDI mPHY functions from lpt_init_pch_refclk drm/i915: extract lpt_enable_clkout_dp from lpt_init_pch_refclk drm/i915: kill ivybridge_irq_preinstall
drm/i915: extract ilk_display_irq_handler
drm/i915: extract ivb_display_irq_handler
drm/i915: don't read or write GEN6_PMIIR on Gen 5 drm/i915: reorganize ironlake_irq_handler
drm/i915: POSTING_READ(DEIER) on ivybridge_irq_handler drm/i915: add ILK/SNB support to ivybridge_irq_handler drm/i915: kill Ivybridge vblank irq vfuncs
drm/i915: kill ivybridge_irq_postinstall
drm/i915: invert {ilk, snb}_gt_irq_handler check drm/i915: extend lpt_enable_clkout_dp
drm/i915: disable CLKOUT_DP when it's not needed drm/i915: add functions to disable and restore LCPLL

Peng Tao (1):
vfs: constify dentry parameter in d_count()

Peter Meerwald (1):
iio staging: fix lis3l02dq, read error handling

Philip J Kelleher (11):
rsxx: Individual workqueues for interruptible events.
rsxx: Restructured DMA cancel scheme.
rsxx: Fixes soft-lockup issues during DMAs.
rsxx: Allow block size to be determined by configuration.
rsxx: Adding in sync_start module paramenter.
rsxx: Changing the adapter name to the official name.
rsxx: Fixes DLPAR add kernel panic if partition still mounted.
rsxx: Adapter address space sanity check.
rsxx: Adding EEH check inside cregs timeout.
rsxx: Fixes incorrect stats calculation.
rsxx: Adding in debugfs entries.

Philipp Reisner (3):
drbd: Ignore the exit code of a fence-peer handler if it returns too late
drbd: Constants should be UPPERCASE
drbd: Allow online change of al-stripes and al-stripe-size

Rafael J. Wysocki (5):
ACPI / scan: Do not try to attach scan handlers to devices having them ACPI / scan: Always call acpi_bus_scan() for bus check notifications ACPI / video / i915: No ACPI backlight if firmware expects Windows 8 Merge branch 'acpi-fixes'
Merge branch 'pm-fixes'

Ralf Baechle (1):
MIPS: Delete dead invocation of exception_exit().

Richard Henderson (10):
alpha: Add kcmp and finit_module syscalls
alpha: Modernize lib/mpi/longlong.h
alpha: Improve atomic_add_unless
alpha: Implement atomic64_dec_if_positive
alpha: Generate dwarf2 unwind info for various kernel entry points.
alpha: Fix type compatibility warning for marvel_map_irq
alpha: Use __builtin_alpha_rpcc
alpha: Don't if-out dp264_device_interrupt.
alpha: Force the user-visible HZ to a constant 1024.
alpha: Use handle_percpu_irq for the timer interrupt

Richard Weinberger (5):
um: Fix return value of strnlen_user()
um: Mark stub pages mapping with VM_PFNMAP
um: Fix wait_stub_done() error handling
um: siginfo cleanup
um: remove dead code

Rodrigo Vivi (7):
drm/i915: split aux_clock_divider logic in a separated function for reuse. drm/i915: Enable/Disable PSR
drm/i915: Added debugfs support for PSR Status
drm/i915: Match all PSR mode entry conditions before enabling it. drm/intel: add enable_psr module option and disable psr by default drm/i915: add update function to disable/enable-back PSR drm/i915: Hook PSR functionality

Roger Pau Monne (12):
xen-blkback: print stats about persistent grants
xen-blkback: use balloon pages for all mappings
xen-blkback: implement LRU mechanism for persistent grants
xen-blkback: move pending handles list from blkbk to pending_req
xen-blkback: make the queue of free requests per backend
xen-blkback: expand map/unmap functions
xen-block: implement indirect descriptors
xen-blkback: allocate list of pending reqs in small chunks
xen-blkfront: use a different scatterlist for each request
xen-blkback: workaround compiler bug in gcc 4.1
xen-blkfront: set blk_queue_max_hw_sectors correctly
xen-blkback: check the number of iovecs before allocating a bios

Rohit Vaswani (1):
drivers: gpio: msm: Fix the error condition for reading ngpio

Sarveshwar Bandi (1):
be2net: Fix to avoid hardware workaround when not needed

Sebastian Ott (1):
s390/qdio: remove unused variable

Shobhit Kumar (2):
drm: Added SDP and VSC structures for handling PSR for eDP drm/i915: Read the EDP DPCD and PSR Capability

Srinivas Pandruvada (2):
Thermal: x86 package temp thermal crash
Thermal: x86_pkg_temp: Limit number of pkg temp zones

Srivatsa S. Bhat (2):
cpufreq: Revert commit a66b2e to fix suspend/resume regression
cpufreq: Revert commit 2f7021a8 to fix CPU hotplug regression

Stefan Bader (1):
xen/blkback: Use physical sector size for setup

Stefan Behrens (1):
Btrfs: fix wrong write offset when replacing a device

Steven Rostedt (1):
Thermal: Fix lockup of cpu_down()

Steven Rostedt (Red Hat) (1):
tracing: Add ref_data to function and fgraph tracer structs

Stéphane Marchesin (1):
drm/i915: Preserve the DDI_A_4_LANES bit from the bios

Theodore Ts'o (5):
ext4: fix error handling in ext4_ext_truncate()
ext4: simplify calculation of blocks to free on error
ext4: make the extent_status code more robust against ENOMEM failures
ext4: yield during large unlinks
ext4: call ext4_es_lru_add() after handling cache miss

Tim Gardner (1):
mlx5 core: Fix __udivdi3 when compiling for 32 bit arches

Tony Wu (1):
MIPS: tlbex: Fix typo in r3000 tlb store handler

Toshi Kani (1):
ACPI / memhotplug: Fix a stale pointer in error path

Tristan Schmelcher (1):
uml: Fix which_tmpdir failure when /dev/shm is a symlink, and in other edge cases

Trond Myklebust (3):
SUNRPC: Fix another issue with rpc_client_register()
NFSv4: Fix a regression against the FreeBSD server
NFSv4: Fix brainfart in attribute length calculation

Wei Yongjun (5):
drbd: fix error return code in drbd_init()
iio: dac: ad7303: fix error return code in ad7303_probe()
iio: ti_am335x_adc: add missing .driver_module to struct iio_info staging:iio:ad7291: add missing .driver_module to struct iio_info
Thermal: x86_pkg_temp: fix krealloc() misuse in in pkg_temp_thermal_device_add()

Will Deacon (2):
arm64: mm: don't treat user cache maintenance faults as writes
alpha: locks: remove unused arch_*_relax operations

Xiao Guangrong (1):
KVM: MMU: avoid fast page fault fixing mmio page fault

Xiong Zhang (1):
drm/i915: add prefault_disable module option

Zheng Liu (2):
ext4: fix a BUG when opening a file with O_TMPFILE flag
ext3: fix a BUG when opening a file with O_TMPFILE flag

stephen hemminger (1):
vxlan: add necessary locking on device removal

zhangwei(Jovi) (3):
tracing: Use correct config guard CONFIG_STACK_TRACER
tracing: Use trace_seq_puts()/trace_seq_putc() where possible
tracing: Typo fix on ring buffer comments

 Documentation/ABI/testing/sysfs-driver-xen-blkback |   17 +
 .../ABI/testing/sysfs-driver-xen-blkfront          |   10 +
 Documentation/bcache.txt                           |   37 +-
 MAINTAINERS                                        |    4 +-
 Makefile                                           |    2 +-
 arch/alpha/Kconfig                                 |    1 +
 arch/alpha/include/asm/atomic.h                    |   88 +-
 arch/alpha/include/asm/param.h                     |    8 +-
 arch/alpha/include/asm/spinlock.h                  |    4 -
 arch/alpha/include/asm/unistd.h                    |    3 +-
 arch/alpha/include/uapi/asm/param.h                |    7 -
 arch/alpha/include/uapi/asm/unistd.h               |    2 +
 arch/alpha/kernel/entry.S                          |  399 +-
 arch/alpha/kernel/irq_alpha.c                      |    2 +-
 arch/alpha/kernel/smp.c                            |    5 +-
 arch/alpha/kernel/sys_dp264.c                      |    8 -
 arch/alpha/kernel/sys_marvel.c                     |    3 +-
 arch/alpha/kernel/systbls.S                        |    2 +
 arch/alpha/kernel/time.c                           |    4 +-
 arch/alpha/kernel/traps.c                          |    8 +-
 arch/arm/mach-s3c24xx/Kconfig                      |    2 +-
 arch/arm64/include/asm/debug-monitors.h            |    7 -
 arch/arm64/include/asm/system_misc.h               |    3 +-
 arch/arm64/kernel/process.c                        |    2 +-
 arch/arm64/kernel/smp.c                            |   15 +-
 arch/arm64/mm/fault.c                              |   46 +-
 arch/mips/Kconfig                                  |    1 +
 arch/mips/cavium-octeon/octeon-platform.c          |    5 +-
 arch/mips/kernel/smp-bmips.c                       |    2 +-
 arch/mips/kernel/traps.c                           |    1 -
 arch/mips/kvm/Kconfig                              |    1 -
 arch/mips/mm/tlbex.c                               |    4 +-
 arch/mips/netlogic/common/irq.c                    |   68 +-
 arch/mips/netlogic/dts/xlp_evp.dts                 |    3 +-
 arch/mips/netlogic/dts/xlp_svp.dts                 |    3 +-
 arch/mips/netlogic/xlp/usb-init.c                  |    2 +-
 arch/s390/include/asm/processor.h                  |   10 +-
 arch/s390/include/asm/switch_to.h                  |    4 +-
 arch/s390/include/uapi/asm/ptrace.h                |    1 +
 arch/s390/kernel/crash_dump.c                      |   51 +-
 arch/s390/kernel/ptrace.c                          |   50 +-
 arch/s390/net/bpf_jit_comp.c                       |  113 +-
 arch/um/include/shared/frame_kern.h                |    8 +-
 arch/um/kernel/signal.c                            |    4 +-
 arch/um/kernel/skas/mmu.c                          |    2 +-
 arch/um/kernel/skas/uaccess.c                      |    2 +-
 arch/um/os-Linux/mem.c                             |  230 +-
 arch/um/os-Linux/signal.c                          |    8 +-
 arch/um/os-Linux/skas/process.c                    |   19 +-
 arch/x86/kvm/mmu.c                                 |    7 +
 arch/x86/um/signal.c                               |    1 -
 drivers/acpi/acpi_memhotplug.c                     |    1 +
 drivers/acpi/acpica/aclocal.h                      |   13 -
 drivers/acpi/internal.h                            |   11 +
 drivers/acpi/scan.c                                |   13 +-
 drivers/acpi/video.c                               |   98 +-
 drivers/acpi/video_detect.c                        |   21 +
 drivers/block/Kconfig                              |    4 +-
 drivers/block/drbd/drbd_actlog.c                   |   21 +
 drivers/block/drbd/drbd_int.h                      |   15 +-
 drivers/block/drbd/drbd_main.c                     |   61 +-
 drivers/block/drbd/drbd_nl.c                       |  185 +-
 drivers/block/drbd/drbd_receiver.c                 |   12 +-
 drivers/block/drbd/drbd_state.c                    |    4 +-
 drivers/block/rsxx/core.c                          |  359 +-
 drivers/block/rsxx/cregs.c                         |   14 +
 drivers/block/rsxx/dev.c                           |   33 +-
 drivers/block/rsxx/dma.c                           |  185 +-
 drivers/block/rsxx/rsxx_priv.h                     |   10 +-
 drivers/block/xen-blkback/blkback.c                |  872 ++-
 drivers/block/xen-blkback/common.h                 |  147 +-
 drivers/block/xen-blkback/xenbus.c                 |   85 +
 drivers/block/xen-blkfront.c                       |  532 +-
 drivers/cpufreq/cpufreq.c                          |    4 +-
 drivers/cpufreq/cpufreq_governor.c                 |    3 -
 drivers/cpufreq/cpufreq_stats.c                    |    6 +-
 drivers/cpufreq/s3c24xx-cpufreq.c                  |    4 +-
 drivers/gpio/gpio-msm-v2.c                         |    2 +-
 drivers/gpio/gpio-omap.c                           |   84 +-
 drivers/gpu/drm/drm_crtc_helper.c                  |   27 +-
 drivers/gpu/drm/drm_mm.c                           |   31 +-
 drivers/gpu/drm/i915/Makefile                      |    2 +
 drivers/gpu/drm/i915/dvo_ch7xxx.c                  |    2 +-
 drivers/gpu/drm/i915/i915_debugfs.c                |  836 +--
 drivers/gpu/drm/i915/i915_dma.c                    |   87 +-
 drivers/gpu/drm/i915/i915_drv.c                    |  292 +-
 drivers/gpu/drm/i915/i915_drv.h                    |  413 +-
 drivers/gpu/drm/i915/i915_gem.c                    |  317 +-
 drivers/gpu/drm/i915/i915_gem_context.c            |   25 +-
 drivers/gpu/drm/i915/i915_gem_debug.c              |    2 +-
 drivers/gpu/drm/i915/i915_gem_evict.c              |   34 +-
 drivers/gpu/drm/i915/i915_gem_execbuffer.c         |   37 +-
 drivers/gpu/drm/i915/i915_gem_gtt.c                |  265 +-
 drivers/gpu/drm/i915/i915_gem_stolen.c             |  131 +-
 drivers/gpu/drm/i915/i915_gem_tiling.c             |   14 +-
 drivers/gpu/drm/i915/i915_gpu_error.c              |  973 +++
 drivers/gpu/drm/i915/i915_irq.c                    | 1354 ++--
 drivers/gpu/drm/i915/i915_reg.h                    |  110 +-
 drivers/gpu/drm/i915/i915_sysfs.c                  |   71 +
 drivers/gpu/drm/i915/i915_trace.h                  |   16 +-
 drivers/gpu/drm/i915/intel_crt.c                   |    4 +
 drivers/gpu/drm/i915/intel_ddi.c                   |   12 +-
 drivers/gpu/drm/i915/intel_display.c               | 1094 ++--
 drivers/gpu/drm/i915/intel_dp.c                    |  418 +-
 drivers/gpu/drm/i915/intel_drv.h                   |   36 +-
 drivers/gpu/drm/i915/intel_dvo.c                   |    5 +-
 drivers/gpu/drm/i915/intel_fb.c                    |    8 +-
 drivers/gpu/drm/i915/intel_hdmi.c                  |    3 +
 drivers/gpu/drm/i915/intel_lvds.c                  |   36 +-
 drivers/gpu/drm/i915/intel_overlay.c               |   22 +-
 drivers/gpu/drm/i915/intel_panel.c                 |    6 +-
 drivers/gpu/drm/i915/intel_pm.c                    |  431 +-
 drivers/gpu/drm/i915/intel_ringbuffer.c            |   43 +-
 drivers/gpu/drm/i915/intel_ringbuffer.h            |    5 +-
 drivers/gpu/drm/i915/intel_sdvo.c                  |   30 +-
 drivers/gpu/drm/i915/intel_sprite.c                |    8 +-
 drivers/gpu/drm/i915/intel_tv.c                    |    4 +
 drivers/gpu/drm/i915/intel_uncore.c                |  595 ++
 drivers/gpu/drm/nouveau/core/engine/bsp/nvc0.c     |    1 +
 drivers/gpu/drm/nouveau/core/engine/bsp/nve0.c     |    1 +
 drivers/gpu/drm/nouveau/core/engine/falcon.c       |   19 +
 drivers/gpu/drm/nouveau/core/engine/ppp/nvc0.c     |    1 +
 drivers/gpu/drm/nouveau/core/engine/vp/nvc0.c      |    1 +
 drivers/gpu/drm/nouveau/core/engine/vp/nve0.c      |    1 +
 .../gpu/drm/nouveau/core/include/engine/falcon.h   |    2 +
 drivers/gpu/drm/nouveau/nouveau_bo.c               |   21 +-
 drivers/gpu/drm/nouveau/nouveau_display.c          |   69 +-
 drivers/gpu/drm/nouveau/nouveau_drm.c              |   15 +-
 drivers/gpu/drm/nouveau/nouveau_fbcon.c            |    1 +
 drivers/gpu/drm/nouveau/nouveau_fence.c            |    2 +-
 drivers/gpu/drm/nouveau/nouveau_gem.c              |    6 -
 drivers/gpu/drm/nouveau/nv50_display.c             |   46 +-
 drivers/iio/adc/ti_am335x_adc.c                    |    1 +
 drivers/iio/dac/ad7303.c                           |    4 +-
 drivers/iio/industrialio-trigger.c                 |    2 +-
 drivers/iio/inkern.c                               |    2 +-
 drivers/iio/pressure/st_pressure_core.c            |    6 +-
 drivers/md/bcache/alloc.c                          |   46 +-
 drivers/md/bcache/bcache.h                         |   61 +-
 drivers/md/bcache/bset.c                           |   56 +-
 drivers/md/bcache/bset.h                           |    4 +
 drivers/md/bcache/btree.c                          |  451 +-
 drivers/md/bcache/btree.h                          |   35 +-
 drivers/md/bcache/closure.c                        |    6 +-
 drivers/md/bcache/debug.c                          |  178 +-
 drivers/md/bcache/debug.h                          |   11 +-
 drivers/md/bcache/io.c                             |   68 +-
 drivers/md/bcache/journal.c                        |   25 +-
 drivers/md/bcache/movinggc.c                       |   24 +-
 drivers/md/bcache/request.c                        |  197 +-
 drivers/md/bcache/request.h                        |    2 +-
 drivers/md/bcache/super.c                          |  171 +-
 drivers/md/bcache/sysfs.c                          |   68 +-
 drivers/md/bcache/trace.c                          |   47 +-
 drivers/md/bcache/util.c                           |   17 -
 drivers/md/bcache/util.h                           |    6 -
 drivers/md/bcache/writeback.c                      |  133 +-
 drivers/md/bcache/writeback.h                      |   64 +
 drivers/net/ethernet/atheros/atl1e/atl1e_main.c    |   24 +-
 drivers/net/ethernet/broadcom/Kconfig              |    1 +
 drivers/net/ethernet/emulex/benet/be_main.c        |   14 +-
 drivers/net/ethernet/mellanox/mlx5/core/debugfs.c  |    2 +-
 drivers/net/hyperv/netvsc_drv.c                    |    4 +-
 drivers/net/macvtap.c                              |   65 +-
 drivers/net/tun.c                                  |   62 +-
 drivers/net/vxlan.c                                |    6 +
 drivers/net/xen-netfront.c                         |   31 +-
 drivers/pnp/pnpacpi/rsparser.c                     |    2 +-
 drivers/pnp/resource.c                             |    1 +
 drivers/s390/cio/qdio_main.c                       |    4 +-
 drivers/s390/crypto/ap_bus.c                       |    1 +
 drivers/staging/Kconfig                            |    2 -
 drivers/staging/Makefile                           |    1 -
 drivers/staging/csr/Kconfig                        |    9 -
 drivers/staging/csr/LICENSE.txt                    |   39 -
 drivers/staging/csr/Makefile                       |   73 -
 drivers/staging/csr/bh.c                           |  404 --
 drivers/staging/csr/csr_framework_ext.c            |   40 -
 drivers/staging/csr/csr_framework_ext.h            |   35 -
 drivers/staging/csr/csr_framework_ext_types.h      |   30 -
 drivers/staging/csr/csr_log.h                      |  223 -
 drivers/staging/csr/csr_log_configure.h            |   39 -
 drivers/staging/csr/csr_log_text.h                 |  124 -
 drivers/staging/csr/csr_macro.h                    |   39 -
 drivers/staging/csr/csr_msg_transport.h            |   17 -
 drivers/staging/csr/csr_msgconv.c                  |  291 -
 drivers/staging/csr/csr_msgconv.h                  |   78 -
 drivers/staging/csr/csr_prim_defs.h                |   55 -
 drivers/staging/csr/csr_result.h                   |   17 -
 drivers/staging/csr/csr_sched.h                    |   85 -
 drivers/staging/csr/csr_sdio.h                     |  723 ---
 .../staging/csr/csr_serialize_primitive_types.c    |  100 -
 drivers/staging/csr/csr_time.c                     |   33 -
 drivers/staging/csr/csr_time.h                     |   76 -
 drivers/staging/csr/csr_util.c                     |   15 -
 drivers/staging/csr/csr_wifi_common.h              |  101 -
 drivers/staging/csr/csr_wifi_fsm.h                 |  240 -
 drivers/staging/csr/csr_wifi_fsm_event.h           |   42 -
 drivers/staging/csr/csr_wifi_fsm_types.h           |  430 --
 drivers/staging/csr/csr_wifi_hip_card.h            |  114 -
 drivers/staging/csr/csr_wifi_hip_card_sdio.c       | 4001 ------------
 drivers/staging/csr/csr_wifi_hip_card_sdio.h       |  694 ---
 drivers/staging/csr/csr_wifi_hip_card_sdio_intr.c  | 2595 --------
 drivers/staging/csr/csr_wifi_hip_card_sdio_mem.c   | 1713 -----
 drivers/staging/csr/csr_wifi_hip_chiphelper.c      |  793 ---
 drivers/staging/csr/csr_wifi_hip_chiphelper.h      |  407 --
 .../staging/csr/csr_wifi_hip_chiphelper_private.h  |  200 -
 drivers/staging/csr/csr_wifi_hip_conversions.h     |   73 -
 drivers/staging/csr/csr_wifi_hip_download.c        |  819 ---
 drivers/staging/csr/csr_wifi_hip_dump.c            |  837 ---
 drivers/staging/csr/csr_wifi_hip_packing.c         | 4804 ---------------
 drivers/staging/csr/csr_wifi_hip_send.c            |  415 --
 drivers/staging/csr/csr_wifi_hip_signals.c         | 1313 ----
 drivers/staging/csr/csr_wifi_hip_signals.h         |  128 -
 drivers/staging/csr/csr_wifi_hip_sigs.h            | 1417 -----
 drivers/staging/csr/csr_wifi_hip_ta_sampling.c     |  541 --
 drivers/staging/csr/csr_wifi_hip_ta_sampling.h     |   66 -
 drivers/staging/csr/csr_wifi_hip_udi.c             |  173 -
 drivers/staging/csr/csr_wifi_hip_unifi.h           |  871 ---
 .../staging/csr/csr_wifi_hip_unifi_signal_names.c  |   41 -
 drivers/staging/csr/csr_wifi_hip_unifi_udi.h       |   52 -
 drivers/staging/csr/csr_wifi_hip_unifihw.h         |   59 -
 drivers/staging/csr/csr_wifi_hip_unifiversion.h    |   30 -
 drivers/staging/csr/csr_wifi_hip_xbv.c             | 1076 ----
 drivers/staging/csr/csr_wifi_hip_xbv.h             |  119 -
 drivers/staging/csr/csr_wifi_hostio_prim.h         |   18 -
 drivers/staging/csr/csr_wifi_lib.h                 |  103 -
 drivers/staging/csr/csr_wifi_msgconv.h             |   49 -
 .../staging/csr/csr_wifi_nme_ap_converter_init.c   |   90 -
 .../staging/csr/csr_wifi_nme_ap_converter_init.h   |   41 -
 .../csr/csr_wifi_nme_ap_free_downstream_contents.c |   84 -
 .../csr/csr_wifi_nme_ap_free_upstream_contents.c   |   39 -
 drivers/staging/csr/csr_wifi_nme_ap_lib.h          |  495 --
 drivers/staging/csr/csr_wifi_nme_ap_prim.h         |  494 --
 drivers/staging/csr/csr_wifi_nme_ap_sef.c          |   30 -
 drivers/staging/csr/csr_wifi_nme_ap_sef.h          |   21 -
 drivers/staging/csr/csr_wifi_nme_ap_serialize.c    |  909 ---
 drivers/staging/csr/csr_wifi_nme_ap_serialize.h    |   94 -
 drivers/staging/csr/csr_wifi_nme_converter_init.h  |   38 -
 drivers/staging/csr/csr_wifi_nme_lib.h             |  991 ---
 drivers/staging/csr/csr_wifi_nme_prim.h            | 1657 -----
 drivers/staging/csr/csr_wifi_nme_serialize.h       |  166 -
 drivers/staging/csr/csr_wifi_nme_task.h            |   27 -
 drivers/staging/csr/csr_wifi_private_common.h      |   81 -
 drivers/staging/csr/csr_wifi_result.h              |   27 -
 .../staging/csr/csr_wifi_router_converter_init.c   |   82 -
 .../staging/csr/csr_wifi_router_converter_init.h   |   34 -
 .../csr/csr_wifi_router_ctrl_converter_init.c      |  134 -
 .../csr/csr_wifi_router_ctrl_converter_init.h      |   34 -
 ...csr_wifi_router_ctrl_free_downstream_contents.c |  108 -
 .../csr_wifi_router_ctrl_free_upstream_contents.c  |   87 -
 drivers/staging/csr/csr_wifi_router_ctrl_lib.h     | 2082 -------
 drivers/staging/csr/csr_wifi_router_ctrl_prim.h    | 2113 -------
 drivers/staging/csr/csr_wifi_router_ctrl_sef.c     |   46 -
 drivers/staging/csr/csr_wifi_router_ctrl_sef.h     |   51 -
 .../staging/csr/csr_wifi_router_ctrl_serialize.c   | 2591 --------
 .../staging/csr/csr_wifi_router_ctrl_serialize.h   |  333 -
 .../csr/csr_wifi_router_free_downstream_contents.c |   53 -
 .../csr/csr_wifi_router_free_upstream_contents.c   |   47 -
 drivers/staging/csr/csr_wifi_router_lib.h          |  417 --
 drivers/staging/csr/csr_wifi_router_prim.h         |  421 --
 drivers/staging/csr/csr_wifi_router_sef.c          |   19 -
 drivers/staging/csr/csr_wifi_router_sef.h          |   25 -
 drivers/staging/csr/csr_wifi_router_serialize.c    |  418 --
 drivers/staging/csr/csr_wifi_router_serialize.h    |   67 -
 drivers/staging/csr/csr_wifi_router_task.h         |   25 -
 drivers/staging/csr/csr_wifi_router_transport.c    |  199 -
 .../csr/csr_wifi_serialize_primitive_types.c       |  256 -
 drivers/staging/csr/csr_wifi_sme_ap_lib.h          |  774 ---
 drivers/staging/csr/csr_wifi_sme_ap_prim.h         | 1030 ----
 drivers/staging/csr/csr_wifi_sme_converter_init.c  |  201 -
 drivers/staging/csr/csr_wifi_sme_converter_init.h  |   34 -
 .../csr/csr_wifi_sme_free_downstream_contents.c    |  187 -
 .../csr/csr_wifi_sme_free_upstream_contents.c      |  275 -
 drivers/staging/csr/csr_wifi_sme_lib.h             | 4303 -------------
 drivers/staging/csr/csr_wifi_sme_prim.h            | 6510 --------------------
 drivers/staging/csr/csr_wifi_sme_sef.c             |   85 -
 drivers/staging/csr/csr_wifi_sme_sef.h             |  142 -
 drivers/staging/csr/csr_wifi_sme_serialize.c       | 5809 -----------------
 drivers/staging/csr/csr_wifi_sme_serialize.h       |  666 --
 drivers/staging/csr/csr_wifi_sme_task.h            |   25 -
 drivers/staging/csr/csr_wifi_vif_utils.h           |   27 -
 drivers/staging/csr/data_tx.c                      |   54 -
 drivers/staging/csr/drv.c                          | 2193 -------
 drivers/staging/csr/firmware.c                     |  396 --
 drivers/staging/csr/inet.c                         |  104 -
 drivers/staging/csr/init_hw.c                      |  108 -
 drivers/staging/csr/io.c                           | 1098 ----
 drivers/staging/csr/mlme.c                         |  433 --
 drivers/staging/csr/monitor.c                      |  384 --
 drivers/staging/csr/netdev.c                       | 3307 ----------
 drivers/staging/csr/os.c                           |  477 --
 drivers/staging/csr/putest.c                       |  685 --
 drivers/staging/csr/sdio_events.c                  |  134 -
 drivers/staging/csr/sdio_mmc.c                     | 1288 ----
 drivers/staging/csr/sdio_stubs.c                   |   82 -
 drivers/staging/csr/sme_blocking.c                 | 1466 -----
 drivers/staging/csr/sme_mgt.c                      | 1012 ---
 drivers/staging/csr/sme_native.c                   |  566 --
 drivers/staging/csr/sme_sys.c                      | 3260 ----------
 drivers/staging/csr/sme_userspace.c                |  315 -
 drivers/staging/csr/sme_userspace.h                |   38 -
 drivers/staging/csr/sme_wext.c                     | 3327 ----------
 drivers/staging/csr/ul_int.c                       |  528 --
 drivers/staging/csr/unifi_clients.h                |  129 -
 drivers/staging/csr/unifi_config.h                 |   34 -
 drivers/staging/csr/unifi_dbg.c                    |  110 -
 drivers/staging/csr/unifi_event.c                  |  692 ---
 drivers/staging/csr/unifi_native.h                 |  257 -
 drivers/staging/csr/unifi_os.h                     |  122 -
 drivers/staging/csr/unifi_pdu_processing.c         | 3729 -----------
 drivers/staging/csr/unifi_priv.h                   | 1136 ----
 drivers/staging/csr/unifi_sme.c                    | 1225 ----
 drivers/staging/csr/unifi_sme.h                    |  245 -
 drivers/staging/csr/unifi_wext.h                   |  108 -
 drivers/staging/csr/unifiio.h                      |  398 --
 drivers/staging/csr/wext_events.c                  |  283 -
 drivers/staging/iio/accel/lis3l02dq_core.c         |    2 +
 drivers/staging/iio/adc/ad7291.c                   |    1 +
 drivers/staging/iio/adc/mxs-lradc.c                |   18 +-
 drivers/thermal/x86_pkg_temp_thermal.c             |   18 +-
 drivers/vhost/net.c                                |   37 +-
 drivers/vhost/scsi.c                               |   17 +-
 drivers/vhost/test.c                               |    6 +-
 drivers/vhost/vhost.h                              |   10 +-
 fs/btrfs/extent-tree.c                             |   27 +-
 fs/btrfs/scrub.c                                   |    2 +-
 fs/ext3/namei.c                                    |    2 +-
 fs/ext4/extents.c                                  |   23 +-
 fs/ext4/extents_status.c                           |   51 +-
 fs/ext4/inode.c                                    |    7 +-
 fs/ext4/namei.c                                    |    2 +-
 fs/fuse/dir.c                                      |   51 +-
 fs/nfs/nfs4xdr.c                                   |   21 +-
 fs/open.c                                          |    2 +
 fs/proc/vmcore.c                                   |    2 +-
 fs/super.c                                         |   25 +-
 include/acpi/acpixf.h                              |    1 +
 include/acpi/actypes.h                             |   15 +
 include/acpi/video.h                               |   11 +-
 include/drm/drm_dp_helper.h                        |   31 +-
 include/drm/drm_mm.h                               |    6 +-
 include/linux/acpi.h                               |    1 +
 include/linux/dcache.h                             |    2 +-
 include/linux/drbd.h                               |    6 +-
 include/linux/drbd_genl.h                          |    2 +
 include/linux/drbd_limits.h                        |    9 +
 include/linux/if_vlan.h                            |    3 +-
 include/linux/iio/iio.h                            |    4 +-
 include/linux/pm_wakeup.h                          |    4 +-
 include/trace/events/bcache.h                      |  381 +-
 include/trace/ftrace.h                             |    4 -
 include/uapi/asm-generic/fcntl.h                   |    4 +-
 include/uapi/drm/i915_drm.h                        |   24 +
 include/xen/interface/io/blkif.h                   |   53 +
 include/xen/interface/io/ring.h                    |    5 +
 kernel/power/autosleep.c                           |    3 +-
 kernel/trace/ring_buffer.c                         |   26 +-
 kernel/trace/trace.c                               |   34 +-
 kernel/trace/trace.h                               |   10 +-
 kernel/trace/trace_event_perf.c                    |   10 +-
 kernel/trace/trace_events.c                        |   98 +-
 kernel/trace/trace_events_filter.c                 |    4 +-
 kernel/trace/trace_functions.c                     |    2 +-
 kernel/trace/trace_functions_graph.c               |   54 +-
 kernel/trace/trace_kprobe.c                        |   29 +-
 kernel/trace/trace_mmiotrace.c                     |    8 +-
 kernel/trace/trace_output.c                        |   14 +-
 kernel/trace/trace_syscalls.c                      |   26 +-
 kernel/trace/trace_uprobe.c                        |    2 -
 kernel/wait.c                                      |    3 +-
 lib/mpi/longlong.h                                 |   17 +-
 net/8021q/vlan_core.c                              |    2 +-
 net/8021q/vlan_dev.c                               |    7 +
 net/core/dev.c                                     |   11 +-
 net/core/ethtool.c                                 |   30 +-
 net/ethernet/eth.c                                 |   21 +-
 net/ipv4/ip_input.c                                |    7 +-
 net/ipv6/ndisc.c                                   |    6 +-
 net/irda/irlan/irlan_eth.c                         |   31 +-
 net/sched/sch_qfq.c                                |   85 +-
 net/sunrpc/clnt.c                                  |    1 +
 382 files changed, 9673 insertions(+), 97332 deletions(-)
 create mode 100644 Documentation/ABI/testing/sysfs-driver-xen-blkback
 create mode 100644 Documentation/ABI/testing/sysfs-driver-xen-blkfront
 create mode 100644 drivers/gpu/drm/i915/i915_gpu_error.c
 create mode 100644 drivers/gpu/drm/i915/intel_uncore.c
 create mode 100644 drivers/md/bcache/writeback.h
 delete mode 100644 drivers/staging/csr/Kconfig
 delete mode 100644 drivers/staging/csr/LICENSE.txt
 delete mode 100644 drivers/staging/csr/Makefile
 delete mode 100644 drivers/staging/csr/bh.c
 delete mode 100644 drivers/staging/csr/csr_framework_ext.c
 delete mode 100644 drivers/staging/csr/csr_framework_ext.h
 delete mode 100644 drivers/staging/csr/csr_framework_ext_types.h
 delete mode 100644 drivers/staging/csr/csr_log.h
 delete mode 100644 drivers/staging/csr/csr_log_configure.h
 delete mode 100644 drivers/staging/csr/csr_log_text.h
 delete mode 100644 drivers/staging/csr/csr_macro.h
 delete mode 100644 drivers/staging/csr/csr_msg_transport.h
 delete mode 100644 drivers/staging/csr/csr_msgconv.c
 delete mode 100644 drivers/staging/csr/csr_msgconv.h
 delete mode 100644 drivers/staging/csr/csr_prim_defs.h
 delete mode 100644 drivers/staging/csr/csr_result.h
 delete mode 100644 drivers/staging/csr/csr_sched.h
 delete mode 100644 drivers/staging/csr/csr_sdio.h
 delete mode 100644 drivers/staging/csr/csr_serialize_primitive_types.c
 delete mode 100644 drivers/staging/csr/csr_time.c
 delete mode 100644 drivers/staging/csr/csr_time.h
 delete mode 100644 drivers/staging/csr/csr_util.c
 delete mode 100644 drivers/staging/csr/csr_wifi_common.h
 delete mode 100644 drivers/staging/csr/csr_wifi_fsm.h
 delete mode 100644 drivers/staging/csr/csr_wifi_fsm_event.h
 delete mode 100644 drivers/staging/csr/csr_wifi_fsm_types.h
 delete mode 100644 drivers/staging/csr/csr_wifi_hip_card.h
 delete mode 100644 drivers/staging/csr/csr_wifi_hip_card_sdio.c
 delete mode 100644 drivers/staging/csr/csr_wifi_hip_card_sdio.h
 delete mode 100644 drivers/staging/csr/csr_wifi_hip_card_sdio_intr.c
 delete mode 100644 drivers/staging/csr/csr_wifi_hip_card_sdio_mem.c
 delete mode 100644 drivers/staging/csr/csr_wifi_hip_chiphelper.c
 delete mode 100644 drivers/staging/csr/csr_wifi_hip_chiphelper.h
 delete mode 100644 drivers/staging/csr/csr_wifi_hip_chiphelper_private.h
 delete mode 100644 drivers/staging/csr/csr_wifi_hip_conversions.h
 delete mode 100644 drivers/staging/csr/csr_wifi_hip_download.c
 delete mode 100644 drivers/staging/csr/csr_wifi_hip_dump.c
 delete mode 100644 drivers/staging/csr/csr_wifi_hip_packing.c
 delete mode 100644 drivers/staging/csr/csr_wifi_hip_send.c
 delete mode 100644 drivers/staging/csr/csr_wifi_hip_signals.c
 delete mode 100644 drivers/staging/csr/csr_wifi_hip_signals.h
 delete mode 100644 drivers/staging/csr/csr_wifi_hip_sigs.h
 delete mode 100644 drivers/staging/csr/csr_wifi_hip_ta_sampling.c
 delete mode 100644 drivers/staging/csr/csr_wifi_hip_ta_sampling.h
 delete mode 100644 drivers/staging/csr/csr_wifi_hip_udi.c
 delete mode 100644 drivers/staging/csr/csr_wifi_hip_unifi.h
 delete mode 100644 drivers/staging/csr/csr_wifi_hip_unifi_signal_names.c
 delete mode 100644 drivers/staging/csr/csr_wifi_hip_unifi_udi.h
 delete mode 100644 drivers/staging/csr/csr_wifi_hip_unifihw.h
 delete mode 100644 drivers/staging/csr/csr_wifi_hip_unifiversion.h
 delete mode 100644 drivers/staging/csr/csr_wifi_hip_xbv.c
 delete mode 100644 drivers/staging/csr/csr_wifi_hip_xbv.h
 delete mode 100644 drivers/staging/csr/csr_wifi_hostio_prim.h
 delete mode 100644 drivers/staging/csr/csr_wifi_lib.h
 delete mode 100644 drivers/staging/csr/csr_wifi_msgconv.h
 delete mode 100644 drivers/staging/csr/csr_wifi_nme_ap_converter_init.c
 delete mode 100644 drivers/staging/csr/csr_wifi_nme_ap_converter_init.h
 delete mode 100644 drivers/staging/csr/csr_wifi_nme_ap_free_downstream_contents.c
 delete mode 100644 drivers/staging/csr/csr_wifi_nme_ap_free_upstream_contents.c
 delete mode 100644 drivers/staging/csr/csr_wifi_nme_ap_lib.h
 delete mode 100644 drivers/staging/csr/csr_wifi_nme_ap_prim.h
 delete mode 100644 drivers/staging/csr/csr_wifi_nme_ap_sef.c
 delete mode 100644 drivers/staging/csr/csr_wifi_nme_ap_sef.h
 delete mode 100644 drivers/staging/csr/csr_wifi_nme_ap_serialize.c
 delete mode 100644 drivers/staging/csr/csr_wifi_nme_ap_serialize.h
 delete mode 100644 drivers/staging/csr/csr_wifi_nme_converter_init.h
 delete mode 100644 drivers/staging/csr/csr_wifi_nme_lib.h
 delete mode 100644 drivers/staging/csr/csr_wifi_nme_prim.h
 delete mode 100644 drivers/staging/csr/csr_wifi_nme_serialize.h
 delete mode 100644 drivers/staging/csr/csr_wifi_nme_task.h
 delete mode 100644 drivers/staging/csr/csr_wifi_private_common.h
 delete mode 100644 drivers/staging/csr/csr_wifi_result.h
 delete mode 100644 drivers/staging/csr/csr_wifi_router_converter_init.c
 delete mode 100644 drivers/staging/csr/csr_wifi_router_converter_init.h
 delete mode 100644 drivers/staging/csr/csr_wifi_router_ctrl_converter_init.c
 delete mode 100644 drivers/staging/csr/csr_wifi_router_ctrl_converter_init.h
 delete mode 100644 drivers/staging/csr/csr_wifi_router_ctrl_free_downstream_contents.c
 delete mode 100644 drivers/staging/csr/csr_wifi_router_ctrl_free_upstream_contents.c
 delete mode 100644 drivers/staging/csr/csr_wifi_router_ctrl_lib.h
 delete mode 100644 drivers/staging/csr/csr_wifi_router_ctrl_prim.h
 delete mode 100644 drivers/staging/csr/csr_wifi_router_ctrl_sef.c
 delete mode 100644 drivers/staging/csr/csr_wifi_router_ctrl_sef.h
 delete mode 100644 drivers/staging/csr/csr_wifi_router_ctrl_serialize.c
 delete mode 100644 drivers/staging/csr/csr_wifi_router_ctrl_serialize.h
 delete mode 100644 drivers/staging/csr/csr_wifi_router_free_downstream_contents.c
 delete mode 100644 drivers/staging/csr/csr_wifi_router_free_upstream_contents.c
 delete mode 100644 drivers/staging/csr/csr_wifi_router_lib.h
 delete mode 100644 drivers/staging/csr/csr_wifi_router_prim.h
 delete mode 100644 drivers/staging/csr/csr_wifi_router_sef.c
 delete mode 100644 drivers/staging/csr/csr_wifi_router_sef.h
 delete mode 100644 drivers/staging/csr/csr_wifi_router_serialize.c
 delete mode 100644 drivers/staging/csr/csr_wifi_router_serialize.h
 delete mode 100644 drivers/staging/csr/csr_wifi_router_task.h
 delete mode 100644 drivers/staging/csr/csr_wifi_router_transport.c
 delete mode 100644 drivers/staging/csr/csr_wifi_serialize_primitive_types.c
 delete mode 100644 drivers/staging/csr/csr_wifi_sme_ap_lib.h
 delete mode 100644 drivers/staging/csr/csr_wifi_sme_ap_prim.h
 delete mode 100644 drivers/staging/csr/csr_wifi_sme_converter_init.c
 delete mode 100644 drivers/staging/csr/csr_wifi_sme_converter_init.h
 delete mode 100644 drivers/staging/csr/csr_wifi_sme_free_downstream_contents.c
 delete mode 100644 drivers/staging/csr/csr_wifi_sme_free_upstream_contents.c
 delete mode 100644 drivers/staging/csr/csr_wifi_sme_lib.h
 delete mode 100644 drivers/staging/csr/csr_wifi_sme_prim.h
 delete mode 100644 drivers/staging/csr/csr_wifi_sme_sef.c
 delete mode 100644 drivers/staging/csr/csr_wifi_sme_sef.h
 delete mode 100644 drivers/staging/csr/csr_wifi_sme_serialize.c
 delete mode 100644 drivers/staging/csr/csr_wifi_sme_serialize.h
 delete mode 100644 drivers/staging/csr/csr_wifi_sme_task.h
 delete mode 100644 drivers/staging/csr/csr_wifi_vif_utils.h
 delete mode 100644 drivers/staging/csr/data_tx.c
 delete mode 100644 drivers/staging/csr/drv.c
 delete mode 100644 drivers/staging/csr/firmware.c
 delete mode 100644 drivers/staging/csr/inet.c
 delete mode 100644 drivers/staging/csr/init_hw.c
 delete mode 100644 drivers/staging/csr/io.c
 delete mode 100644 drivers/staging/csr/mlme.c
 delete mode 100644 drivers/staging/csr/monitor.c
 delete mode 100644 drivers/staging/csr/netdev.c
 delete mode 100644 drivers/staging/csr/os.c
 delete mode 100644 drivers/staging/csr/putest.c
 delete mode 100644 drivers/staging/csr/sdio_events.c
 delete mode 100644 drivers/staging/csr/sdio_mmc.c
 delete mode 100644 drivers/staging/csr/sdio_stubs.c
 delete mode 100644 drivers/staging/csr/sme_blocking.c
 delete mode 100644 drivers/staging/csr/sme_mgt.c
 delete mode 100644 drivers/staging/csr/sme_native.c
 delete mode 100644 drivers/staging/csr/sme_sys.c
 delete mode 100644 drivers/staging/csr/sme_userspace.c
 delete mode 100644 drivers/staging/csr/sme_userspace.h
 delete mode 100644 drivers/staging/csr/sme_wext.c
 delete mode 100644 drivers/staging/csr/ul_int.c
 delete mode 100644 drivers/staging/csr/unifi_clients.h
 delete mode 100644 drivers/staging/csr/unifi_config.h
 delete mode 100644 drivers/staging/csr/unifi_dbg.c
 delete mode 100644 drivers/staging/csr/unifi_event.c
 delete mode 100644 drivers/staging/csr/unifi_native.h
 delete mode 100644 drivers/staging/csr/unifi_os.h
 delete mode 100644 drivers/staging/csr/unifi_pdu_processing.c
 delete mode 100644 drivers/staging/csr/unifi_priv.h
 delete mode 100644 drivers/staging/csr/unifi_sme.c
 delete mode 100644 drivers/staging/csr/unifi_sme.h
 delete mode 100644 drivers/staging/csr/unifi_wext.h
 delete mode 100644 drivers/staging/csr/unifiio.h
 delete mode 100644 drivers/staging/csr/wext_events.c

--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch

#2 lore raw
Quoted 18 lines · Dave Airlie
Quoted 1 line · Daniel Vetter

Hi Dave,

Okay since I missed this, then I merged patches from the list from David Herrmann
fixing up drm_mm usage, then I merged this and it all fell to pieces.

CC [M] drivers/gpu/drm/i915/i915_gem_gtt.o
CC [M] drivers/gpu/drm/i915/i915_gem_stolen.o
/home/airlied/devel/kernel/drm-next/drivers/gpu/drm/i915/i915_gem_stolen.c:
In function ‘i915_gem_object_create_stolen_for_preallocated’:
/home/airlied/devel/kernel/drm-next/drivers/gpu/drm/i915/i915_gem_stolen.c:426:2:
error: implicit declaration of function ‘drm_mm_put_block’ [-Werror=implicit-function-declaration]
drm_mm_put_block(stolen);
^
cc1: some warnings being treated as errors

Quoted 1 line

Smash a patch on top of this if you like or whatever you it is you want.

Indeed I've merged a little error path fix which added a new put_block call, and I've missed that this will cause a new conflict. Below the fixup I've squashed into the nightly tree, can you please squash that into your merge commit?

Thanks, Daniel

drivers/gpu/drm/i915/i915_gem_stolen.c +2 -1
index 0d0a3b1..ba4dabc 100644
@@ -423,7 +423,8 @@ i915_gem_object_create_stolen_for_preallocated(struct drm_device *dev,
 	return obj;
 
 err_out:
-	drm_mm_put_block(stolen);
+	drm_mm_remove_node(stolen);
+	kfree(stolen);
 	drm_gem_object_unreference(&obj->base);
 	return NULL;
 }
Signature · 7 lines
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/dri-devel