]> Git Repo - linux.git/commitdiff
Merge tag 'wireless-drivers-for-davem-2016-06-04' of git://git.kernel.org/pub/scm...
authorDavid S. Miller <[email protected]>
Sun, 5 Jun 2016 02:14:53 +0000 (22:14 -0400)
committerDavid S. Miller <[email protected]>
Sun, 5 Jun 2016 02:14:53 +0000 (22:14 -0400)
Kalle Valo says:

====================
wireless-drivers fixes for 4.7

brcmfmac

* add fallback RSSI report for devices that do not report per-chain values
* fix a null pointer derefence regression on PCIe full dongle devices

rtlwifi

* fix scheduling while atomic regression from commit 49f86ec21c01

MAINTAINERS

* add file patterns for wireless device tree bindings
====================

Signed-off-by: David S. Miller <[email protected]>
1  2 
MAINTAINERS

diff --combined MAINTAINERS
index f8d5a3772e47c3ed723187a8f3db15f5beadf312,7e4734623579a35df4ef7a94caa7777911ee6e24..79c622e9760280a86b2eb20a5373155ae65364dd
@@@ -856,12 -856,6 +856,12 @@@ S:       Maintaine
  F:    drivers/net/arcnet/
  F:    include/uapi/linux/if_arcnet.h
  
 +ARC PGU DRM DRIVER
 +M:    Alexey Brodkin <[email protected]>
 +S:    Supported
 +F:    drivers/gpu/drm/arc/
 +F:    Documentation/devicetree/bindings/display/snps,arcpgu.txt
 +
  ARM HDLCD DRM DRIVER
  M:    Liviu Dudau <[email protected]>
  S:    Supported
  S:    Maintained
  F:    drivers/platform/x86/asus-wireless.c
  
 +ASYMMETRIC KEYS
 +M:    David Howells <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/crypto/asymmetric-keys.txt
 +F:    include/linux/verification.h
 +F:    include/crypto/public_key.h
 +F:    include/crypto/pkcs7.h
 +F:    crypto/asymmetric_keys/
 +
  ASYNCHRONOUS TRANSFERS/TRANSFORMS (IOAT) API
  R:    Dan Williams <[email protected]>
  W:    http://sourceforge.net/projects/xscaleiop
@@@ -2304,7 -2288,7 +2304,7 @@@ BCACHE (BLOCK LAYER CACHE
  M:    Kent Overstreet <[email protected]>
  L:    [email protected]
  W:    http://bcache.evilpiepirate.org
 -S:    Maintained
 +S:    Orphan
  F:    drivers/md/bcache/
  
  BDISP ST MEDIA DRIVER
@@@ -2505,7 -2489,6 +2505,7 @@@ M:      Hauke Mehrtens <[email protected]
  M:    Rafał Miłecki <[email protected]>
  L:    [email protected]
  S:    Maintained
 +F:    Documentation/devicetree/bindings/mips/brcm/
  F:    arch/mips/bcm47xx/*
  F:    arch/mips/include/asm/mach-bcm47xx/*
  
@@@ -3854,25 -3837,9 +3854,25 @@@ T:    git git://people.freedesktop.org/~ai
  S:    Maintained
  F:    drivers/gpu/drm/
  F:    drivers/gpu/vga/
 +F:    Documentation/DocBook/gpu.*
  F:    include/drm/
  F:    include/uapi/drm/
  
 +DRM DRIVER FOR AST SERVER GRAPHICS CHIPS
 +M:    Dave Airlie <[email protected]>
 +S:    Odd Fixes
 +F:    drivers/gpu/drm/ast/
 +
 +DRM DRIVER FOR BOCHS VIRTUAL GPU
 +M:    Gerd Hoffmann <[email protected]>
 +S:    Odd Fixes
 +F:    drivers/gpu/drm/bochs/
 +
 +DRM DRIVER FOR QEMU'S CIRRUS DEVICE
 +M:    Dave Airlie <[email protected]>
 +S:    Odd Fixes
 +F:    drivers/gpu/drm/cirrus/
 +
  RADEON and AMDGPU DRM DRIVERS
  M:    Alex Deucher <[email protected]>
  M:    Christian König <[email protected]>
@@@ -3880,9 -3847,9 +3880,9 @@@ L:      [email protected]
  T:    git git://people.freedesktop.org/~agd5f/linux
  S:    Supported
  F:    drivers/gpu/drm/radeon/
 -F:    include/uapi/drm/radeon*
 +F:    include/uapi/drm/radeon_drm.h
  F:    drivers/gpu/drm/amd/
 -F:    include/uapi/drm/amdgpu*
 +F:    include/uapi/drm/amdgpu_drm.h
  
  DRM PANEL DRIVERS
  M:    Thierry Reding <[email protected]>
@@@ -3905,7 -3872,7 +3905,7 @@@ T:      git git://anongit.freedesktop.org/dr
  S:    Supported
  F:    drivers/gpu/drm/i915/
  F:    include/drm/i915*
 -F:    include/uapi/drm/i915*
 +F:    include/uapi/drm/i915_drm.h
  
  DRM DRIVERS FOR ATMEL HLCDC
  M:    Boris Brezillon <[email protected]>
@@@ -3914,13 -3881,6 +3914,13 @@@ S:    Supporte
  F:    drivers/gpu/drm/atmel-hlcdc/
  F:    Documentation/devicetree/bindings/drm/atmel/
  
 +DRM DRIVERS FOR ALLWINNER A10
 +M:    Maxime Ripard  <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/gpu/drm/sun4i/
 +F:    Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt
 +
  DRM DRIVERS FOR EXYNOS
  M:    Inki Dae <[email protected]>
  M:    Joonyoung Shim <[email protected]>
@@@ -3930,8 -3890,8 +3930,8 @@@ L:      [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos.git
  S:    Supported
  F:    drivers/gpu/drm/exynos/
 -F:    include/drm/exynos*
 -F:    include/uapi/drm/exynos*
 +F:    include/uapi/drm/exynos_drm.h
 +F:    Documentation/devicetree/bindings/display/exynos/
  
  DRM DRIVERS FOR FREESCALE DCU
  M:    Stefan Agner <[email protected]>
@@@ -3940,7 -3900,6 +3940,7 @@@ L:      [email protected]
  S:    Supported
  F:    drivers/gpu/drm/fsl-dcu/
  F:    Documentation/devicetree/bindings/display/fsl,dcu.txt
 +F:    Documentation/devicetree/bindings/display/fsl,tcon.txt
  F:    Documentation/devicetree/bindings/display/panel/nec,nl4827hc19_05b.txt
  
  DRM DRIVERS FOR FREESCALE IMX
@@@ -3956,45 -3915,12 +3956,45 @@@ M:   Patrik Jakobsson <patrik.r.jakobsson
  L:    [email protected]
  T:    git git://github.com/patjak/drm-gma500
  S:    Maintained
 -F:    drivers/gpu/drm/gma500
 -F:    include/drm/gma500*
 +F:    drivers/gpu/drm/gma500/
 +
 +DRM DRIVERS FOR HISILICON
 +M:    Xinliang Liu <[email protected]>
 +R:    Xinwei Kong <[email protected]>
 +R:    Chen Feng <[email protected]>
 +L:    [email protected]
 +T:    git git://github.com/xin3liang/linux.git
 +S:    Maintained
 +F:    drivers/gpu/drm/hisilicon/
 +F:    Documentation/devicetree/bindings/display/hisilicon/
 +
 +DRM DRIVER FOR INTEL I810 VIDEO CARDS
 +S:    Orphan / Obsolete
 +F:    drivers/gpu/drm/i810/
 +F:    include/uapi/drm/i810_drm.h
 +
 +DRM DRIVER FOR MSM ADRENO GPU
 +M:    Rob Clark <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +L:    [email protected]
 +T:    git git://people.freedesktop.org/~robclark/linux
 +S:    Maintained
 +F:    drivers/gpu/drm/msm/
 +F:    include/uapi/drm/msm_drm.h
 +F:    Documentation/devicetree/bindings/display/msm/
 +
 +DRM DRIVER FOR NVIDIA GEFORCE/QUADRO GPUS
 +M:    Ben Skeggs <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +T:    git git://github.com/skeggsb/linux
 +S:    Supported
 +F:    drivers/gpu/drm/nouveau/
 +F:    include/uapi/drm/nouveau_drm.h
  
  DRM DRIVERS FOR NVIDIA TEGRA
  M:    Thierry Reding <[email protected]>
 -M:    Terje Bergström <[email protected]>
  L:    [email protected]
  L:    [email protected]
  T:    git git://anongit.freedesktop.org/tegra/linux.git
@@@ -4005,54 -3931,22 +4005,54 @@@ F:   include/linux/host1x.
  F:    include/uapi/drm/tegra_drm.h
  F:    Documentation/devicetree/bindings/display/tegra/nvidia,tegra20-host1x.txt
  
 +DRM DRIVER FOR MATROX G200/G400 GRAPHICS CARDS
 +S:    Orphan / Obsolete
 +F:    drivers/gpu/drm/mga/
 +F:    include/uapi/drm/mga_drm.h
 +
 +DRM DRIVER FOR MGA G200 SERVER GRAPHICS CHIPS
 +M:    Dave Airlie <[email protected]>
 +S:    Odd Fixes
 +F:    drivers/gpu/drm/mgag200/
 +
 +DRM DRIVER FOR RAGE 128 VIDEO CARDS
 +S:    Orphan / Obsolete
 +F:    drivers/gpu/drm/r128/
 +F:    include/uapi/drm/r128_drm.h
 +
  DRM DRIVERS FOR RENESAS
  M:    Laurent Pinchart <[email protected]>
  L:    [email protected]
  L:    [email protected]
 -T:    git git://people.freedesktop.org/~airlied/linux
 +T:    git git://linuxtv.org/pinchartl/fbdev
  S:    Supported
  F:    drivers/gpu/drm/rcar-du/
  F:    drivers/gpu/drm/shmobile/
  F:    include/linux/platform_data/shmob_drm.h
 +F:    Documentation/devicetree/bindings/display/renesas,du.txt
 +
 +DRM DRIVER FOR QXL VIRTUAL GPU
 +M:    Dave Airlie <[email protected]>
 +S:    Odd Fixes
 +F:    drivers/gpu/drm/qxl/
 +F:    include/uapi/drm/qxl_drm.h
  
  DRM DRIVERS FOR ROCKCHIP
  M:    Mark Yao <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/gpu/drm/rockchip/
 -F:    Documentation/devicetree/bindings/display/rockchip*
 +F:    Documentation/devicetree/bindings/display/rockchip/
 +
 +DRM DRIVER FOR SAVAGE VIDEO CARDS
 +S:    Orphan / Obsolete
 +F:    drivers/gpu/drm/savage/
 +F:    include/uapi/drm/savage_drm.h
 +
 +DRM DRIVER FOR SIS VIDEO CARDS
 +S:    Orphan / Obsolete
 +F:    drivers/gpu/drm/sis/
 +F:    include/uapi/drm/sis_drm.h
  
  DRM DRIVERS FOR STI
  M:    Benjamin Gaignard <[email protected]>
@@@ -4063,43 -3957,14 +4063,43 @@@ S:   Maintaine
  F:    drivers/gpu/drm/sti
  F:    Documentation/devicetree/bindings/display/st,stih4xx.txt
  
 +DRM DRIVER FOR TDFX VIDEO CARDS
 +S:    Orphan / Obsolete
 +F:    drivers/gpu/drm/tdfx/
 +
 +DRM DRIVER FOR USB DISPLAYLINK VIDEO ADAPTERS
 +M:    Dave Airlie <[email protected]>
 +S:    Odd Fixes
 +F:    drivers/gpu/drm/udl/
 +
  DRM DRIVERS FOR VIVANTE GPU IP
  M:    Lucas Stach <[email protected]>
  R:    Russell King <[email protected]>
  R:    Christian Gmeiner <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    drivers/gpu/drm/etnaviv
 -F:    Documentation/devicetree/bindings/display/etnaviv
 +F:    drivers/gpu/drm/etnaviv/
 +F:    include/uapi/drm/etnaviv_drm.h
 +F:    Documentation/devicetree/bindings/display/etnaviv/
 +
 +DRM DRIVER FOR VMWARE VIRTUAL GPU
 +M:    "VMware Graphics" <[email protected]>
 +M:    Sinclair Yeh <[email protected]>
 +M:    Thomas Hellstrom <[email protected]>
 +L:    [email protected]
 +T:    git git://people.freedesktop.org/~syeh/repos_linux
 +T:    git git://people.freedesktop.org/~thomash/linux
 +S:    Supported
 +F:    drivers/gpu/drm/vmwgfx/
 +F:    include/uapi/drm/vmwgfx_drm.h
 +
 +DRM DRIVERS FOR VC4
 +M:    Eric Anholt <[email protected]>
 +T:    git git://github.com/anholt/linux
 +S:    Supported
 +F:    drivers/gpu/drm/vc4/
 +F:    include/uapi/drm/vc4_drm.h
 +F:    Documentation/devicetree/bindings/display/brcm,bcm-vc4.txt
  
  DSBR100 USB FM RADIO DRIVER
  M:    Alexey Klimov <[email protected]>
@@@ -4994,7 -4859,6 +4994,7 @@@ F:      drivers/scsi/gdt
  
  GDB KERNEL DEBUGGING HELPER SCRIPTS
  M:    Jan Kiszka <[email protected]>
 +M:    Kieran Bingham <[email protected]>
  S:    Supported
  F:    scripts/gdb/
  
@@@ -5309,13 -5173,6 +5309,13 @@@ F:    drivers/block/cciss
  F:    include/linux/cciss_ioctl.h
  F:    include/uapi/linux/cciss_ioctl.h
  
 +HFI1 DRIVER
 +M:    Mike Marciniszyn <[email protected]>
 +M:    Dennis Dalessandro <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/infiniband/hw/hfi1
 +
  HFS FILESYSTEM
  L:    [email protected]
  S:    Orphan
@@@ -5845,6 -5702,7 +5845,6 @@@ T:      git git://git.kernel.org/pub/scm/lin
  S:    Supported
  F:    Documentation/infiniband/
  F:    drivers/infiniband/
 -F:    drivers/staging/rdma/
  F:    include/uapi/linux/if_infiniband.h
  F:    include/uapi/rdma/
  F:    include/rdma/
@@@ -6103,14 -5961,6 +6103,14 @@@ S:    Maintaine
  F:    arch/x86/include/asm/intel_telemetry.h
  F:    drivers/platform/x86/intel_telemetry*
  
 +INTEL PMC CORE DRIVER
 +M:    Rajneesh Bhardwaj <[email protected]>
 +M:    Vishwanath Somayaji <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    arch/x86/include/asm/pmc_core.h
 +F:    drivers/platform/x86/intel_pmc_core*
 +
  IOC3 ETHERNET DRIVER
  M:    Ralf Baechle <[email protected]>
  L:    [email protected]
@@@ -6428,9 -6278,8 +6428,9 @@@ F:      Documentation/kbuild/kconfig-languag
  F:    scripts/kconfig/
  
  KDUMP
 -M:    Vivek Goyal <[email protected]>
 -M:    Haren Myneni <[email protected]>
 +M:    Dave Young <[email protected]>
 +M:    Baoquan He <[email protected]>
 +R:    Vivek Goyal <[email protected]>
  L:    [email protected]
  W:    http://lse.sourceforge.net/kdump/
  S:    Maintained
@@@ -6507,7 -6356,6 +6507,7 @@@ F:      arch/*/include/asm/kvm
  F:    include/linux/kvm*
  F:    include/uapi/linux/kvm*
  F:    virt/kvm/
 +F:    tools/kvm/
  
  KERNEL VIRTUAL MACHINE (KVM) FOR AMD-V
  M:    Joerg Roedel <[email protected]>
@@@ -6576,7 -6424,7 +6576,7 @@@ L:      [email protected]
  S:    Maintained
  F:    include/linux/kexec.h
  F:    include/uapi/linux/kexec.h
 -F:    kernel/kexec.c
 +F:    kernel/kexec*
  
  KEYS/KEYRINGS:
  M:    David Howells <[email protected]>
@@@ -6585,8 -6433,6 +6585,8 @@@ S:      Maintaine
  F:    Documentation/security/keys.txt
  F:    include/linux/key.h
  F:    include/linux/key-type.h
 +F:    include/linux/keyctl.h
 +F:    include/uapi/linux/keyctl.h
  F:    include/keys/
  F:    security/keys/
  
@@@ -7159,8 -7005,6 +7159,8 @@@ MARVELL ARMADA DRM SUPPOR
  M:    Russell King <[email protected]>
  S:    Maintained
  F:    drivers/gpu/drm/armada/
 +F:    include/uapi/drm/armada_drm.h
 +F:    Documentation/devicetree/bindings/display/armada/
  
  MARVELL 88E6352 DSA support
  M:    Guenter Roeck <[email protected]>
@@@ -7522,7 -7366,6 +7522,7 @@@ W:      http://www.linux-mips.org
  T:    git git://git.linux-mips.org/pub/scm/ralf/linux.git
  Q:    http://patchwork.linux-mips.org/project/linux-mips/list/
  S:    Supported
 +F:    Documentation/devicetree/bindings/mips/
  F:    Documentation/mips/
  F:    arch/mips/
  
@@@ -8008,6 -7851,7 +8008,7 @@@ Q:      http://patchwork.kernel.org/project/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git
  S:    Maintained
+ F:    Documentation/devicetree/bindings/net/wireless/
  F:    drivers/net/wireless/
  
  NETXEN (1/10) GbE SUPPORT
@@@ -8058,7 -7902,6 +8059,7 @@@ NILFS2 FILESYSTE
  M:    Ryusuke Konishi <[email protected]>
  L:    [email protected]
  W:    http://nilfs.sourceforge.net/
 +W:    http://nilfs.osdn.jp/
  T:    git git://github.com/konis/nilfs2.git
  S:    Supported
  F:    Documentation/filesystems/nilfs2.txt
@@@ -8900,7 -8743,6 +8901,7 @@@ F:      arch/*/kernel/*/perf_event*.
  F:    arch/*/kernel/*/*/perf_event*.c
  F:    arch/*/include/asm/perf_event.h
  F:    arch/*/kernel/perf_callchain.c
 +F:    arch/*/events/*
  F:    tools/perf/
  
  PERSONALITY HANDLING
@@@ -10929,6 -10771,12 +10930,6 @@@ M:  Arnaud Patard <arnaud.patard@rtp-net
  S:    Odd Fixes
  F:    drivers/staging/xgifb/
  
 -HFI1 DRIVER
 -M:    Mike Marciniszyn <[email protected]>
 -L:    [email protected]
 -S:    Supported
 -F:    drivers/staging/rdma/hfi1
 -
  STARFIRE/DURALAN NETWORK DRIVER
  M:    Ion Badulescu <[email protected]>
  S:    Odd Fixes
@@@ -11309,7 -11157,6 +11310,7 @@@ F:   drivers/platform/x86/thinkpad_acpi.
  
  TI BANDGAP AND THERMAL DRIVER
  M:    Eduardo Valentin <[email protected]>
 +M:    Keerthy <[email protected]>
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
  W:    http://www.linux-watchdog.org/
  T:    git git://www.linux-watchdog.org/linux-watchdog.git
  S:    Maintained
 +F:    Documentation/devicetree/bindings/watchdog/
  F:    Documentation/watchdog/
  F:    drivers/watchdog/
  F:    include/linux/watchdog.h
This page took 0.100153 seconds and 4 git commands to generate.