Johannes Berg e7881bd594 Revert "mac80211: Add TXQ scheduling API" ...

This reverts commit e937b8da5a.

Turns out that a new driver (mt76) is coming in through
Kalle's tree, and will conflict with this. It also has some
conflicting requirements, so we'll revisit this later.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>

2017-12-19 10:12:48 +01:00

..

accessibility

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

acpi

ACPI / CPPC: Fix KASAN global out of bounds warning

2017-12-05 23:25:49 +01:00

amba

Merge tag 'dma-mapping-4.15' of git://git.infradead.org/users/hch/dma-mapping

2017-11-14 16:54:12 -08:00

android

ANDROID: binder: fix transaction leak.

2017-11-28 16:54:45 +01:00

ata

Merge branch 'for-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata

2017-11-15 14:11:41 -08:00

atm

atm: eni: fix several indentation issues

2017-11-30 09:26:32 -05:00

auxdisplay

auxdisplay: img-ascii-lcd: Only build on archs that have IOMEM

2017-11-27 12:36:45 -08:00

base

Merge tag 'pm-4.15-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

2017-12-08 09:58:10 -08:00

bcma

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

2017-11-15 11:56:19 -08:00

block

Merge branch 'for-linus' of git://git.kernel.dk/linux-block

2017-12-01 08:05:45 -05:00

bluetooth

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2017-11-04 09:26:51 +09:00

bus

Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2017-11-16 16:05:01 -08:00

cdrom

Merge branch 'for-4.15/block' of git://git.kernel.dk/linux-block

2017-11-14 15:32:19 -08:00

char

Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2017-11-26 14:11:54 -08:00

clk

Merge tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux

2017-11-17 20:04:24 -08:00

clocksource

Merge tag 'for-linus-timers-conversion-final-v4.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux into timers/urgent

2017-11-23 16:29:05 +01:00

connector

drivers, connector: convert cn_callback_entry.refcnt from atomic_t to refcount_t

2017-10-22 02:22:39 +01:00

cpufreq

cpufreq: mediatek: add missing MODULE_DESCRIPTION/AUTHOR/LICENSE

2017-11-22 00:00:14 +01:00

cpuidle

Merge tag 'powerpc-4.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux

2017-11-16 12:47:46 -08:00

crypto

Merge tag 'powerpc-4.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux

2017-11-16 12:47:46 -08:00

dax

device-dax: implement ->split() to catch invalid munmap attempts

2017-11-29 18:40:42 -08:00

dca

…

devfreq

Merge branches 'pm-devfreq' and 'pm-tools'

2017-11-13 01:41:39 +01:00

dio

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

dma

Merge tag 'dmaengine-4.15-rc1' of git://git.infradead.org/users/vkoul/slave-dma

2017-11-14 16:49:31 -08:00

dma-buf

Merge tag 'trace-v4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace

2017-11-17 14:58:01 -08:00

edac

Merge tag 'modules-for-v4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux

2017-11-15 13:46:33 -08:00

eisa

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

extcon

Merge tag 'usb-4.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

2017-11-13 21:14:07 -08:00

firewire

Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2017-11-13 17:56:58 -08:00

firmware

efi: Add comment to avoid future expanding of sysfs systab

2017-12-06 19:32:23 +01:00

fmc

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

fpga

Merge tag 'char-misc-4.15-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc

2017-11-16 09:10:59 -08:00

fsi

…

gpio

gpio: pca953x: fix vendor prefix for PCA9654

2017-12-02 22:41:43 +01:00

gpu

Merge tag 'drm-misc-fixes-2017-12-07' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes

2017-12-08 08:17:53 +10:00

hid

treewide: setup_timer() -> timer_setup()

2017-11-21 15:57:07 -08:00

hsi

Merge tag 'hsi-for-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi

2017-11-15 13:35:43 -08:00

hv

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2017-12-09 22:09:55 -05:00

hwmon

hwmon: (jc42) optionally try to disable the SMBUS timeout

2017-11-30 13:12:44 -08:00

hwspinlock

Merge tag 'hwlock-v4.15' of git://github.com/andersson/remoteproc

2017-11-17 20:16:20 -08:00

hwtracing

Merge tag 'char-misc-4.15-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc

2017-11-16 09:10:59 -08:00

i2c

i2c: i2c-boardinfo: fix memory leaks on devinfo

2017-11-27 19:14:29 +01:00

ide

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide

2017-11-19 08:04:41 -10:00

idle

Merge branch 'pm-cpuidle'

2017-11-13 01:34:14 +01:00

iio

iio: health: max30102: Temperature should be in milli Celsius

2017-12-02 11:15:14 +00:00

infiniband

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma

2017-12-05 10:10:15 -08:00

input

treewide: Remove TIMER_FUNC_TYPE and TIMER_DATA_TYPE casts

2017-11-21 16:35:54 -08:00

iommu

Merge tag 'iommu-v4.15-rc3' of git://github.com/awilliam/linux-vfio

2017-12-06 10:53:02 -08:00

ipack

…

irqchip

Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2017-11-26 14:39:20 -08:00

isdn

treewide: setup_timer() -> timer_setup() (2 field)

2017-11-21 15:57:09 -08:00

leds

Merge tag 'leds_for_4.15rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski/linux-leds

2017-11-14 18:09:31 -08:00

lightnvm

lightnvm: Convert timers to use timer_setup()

2017-11-21 15:46:44 -08:00

macintosh

Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2017-11-13 17:56:58 -08:00

mailbox

Merge tag 'mailbox-v4.15' of git://git.linaro.org/landing-teams/working/fujitsu/integration

2017-11-15 13:39:18 -08:00

mcb

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

md

md/raid1/10: add missed blk plug

2017-12-01 12:19:48 -08:00

media

Merge tag 'media/v4.15-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

2017-12-08 13:18:47 -08:00

memory

Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2017-11-16 16:05:01 -08:00

memstick

treewide: setup_timer() -> timer_setup()

2017-11-21 15:57:07 -08:00

message

Merge tag 'modules-for-v4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux

2017-11-15 13:46:33 -08:00

mfd

treewide: setup_timer() -> timer_setup()

2017-11-21 15:57:07 -08:00

misc

Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux

2017-12-03 10:48:24 -05:00

mmc

Merge tag 'mmc-v4.15-2' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc

2017-12-01 08:14:22 -05:00

mtd

Rename superblock flags (MS_xyz -> SB_xyz)

2017-11-27 13:05:09 -08:00

mux

…

net

Revert "mac80211: Add TXQ scheduling API"

2017-12-19 10:12:48 +01:00

nfc

treewide: setup_timer() -> timer_setup() (2 field)

2017-11-21 15:57:09 -08:00

ntb

treewide: setup_timer() -> timer_setup()

2017-11-21 15:57:07 -08:00

nubus

Merge tag 'm68k-for-v4.15-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k

2017-11-13 12:10:24 -08:00

nvdimm

Merge tag 'libnvdimm-for-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm

2017-11-17 09:51:57 -08:00

nvme

nvme-pci: fix NULL pointer dereference in nvme_free_host_mem()

2017-11-28 08:49:26 -08:00

nvmem

Merge tag 'char-misc-4.15-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc

2017-11-16 09:10:59 -08:00

of

of: overlay: Make node skipping in init_overlay_changeset() clearer

2017-12-08 09:32:18 -06:00

opp

…

oprofile

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

parisc

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

parport

Merge tag 'char-misc-4.15-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc

2017-11-16 09:10:59 -08:00

pci

Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2017-11-26 14:11:54 -08:00

pcmcia

drivers/pcmcia/sa1111_badge4.c: avoid unused function warning

2017-11-17 16:10:04 -08:00

perf

Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux

2017-11-15 10:56:56 -08:00

phy

Merge tag 'usb-4.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

2017-11-13 21:14:07 -08:00

pinctrl

pinctrl: sunxi: Disable strict mode for H5 driver

2017-11-30 16:50:43 +01:00

platform

Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2017-11-25 08:37:16 -10:00

pnp

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

power

Merge tag 'for-v4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply

2017-11-15 13:37:15 -08:00

powercap

…

pps

treewide: setup_timer() -> timer_setup()

2017-11-21 15:57:07 -08:00

ps3

…

ptp

Merge tag 'for-linus-4.15-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip

2017-11-16 13:06:27 -08:00

pwm

Merge tag 'pwm/for-4.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm

2017-11-22 21:09:18 -10:00

rapidio

Merge branch 'akpm' (patches from Andrew)

2017-11-17 16:56:17 -08:00

ras

Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2017-11-13 17:56:58 -08:00

regulator

Merge tag 'mfd-next-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd

2017-11-16 09:15:57 -08:00

remoteproc

Merge tag 'rproc-v4.15' of git://github.com/andersson/remoteproc

2017-11-17 20:14:10 -08:00

reset

Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2017-11-16 16:05:01 -08:00

rpmsg

Merge tag 'rpmsg-v4.15' of git://github.com/andersson/remoteproc

2017-11-17 20:12:08 -08:00

rtc

Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2017-11-25 08:37:16 -10:00

s390

s390: add a few more SPDX identifiers

2017-12-05 07:51:09 +01:00

sbus

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc

2017-11-17 20:21:44 -08:00

scsi

Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

2017-12-05 10:31:32 -08:00

sfi

…

sh

Merge tag 'dma-mapping-4.15' of git://git.infradead.org/users/hch/dma-mapping

2017-11-14 16:54:12 -08:00

sn

…

soc

Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2017-11-16 16:05:01 -08:00

spi

Merge remote-tracking branches 'spi/topic/sh-msiof', 'spi/topic/slave', 'spi/topic/spreadtrum' and 'spi/topic/tegra114' into spi-next

2017-11-10 21:33:51 +00:00

spmi

…

ssb

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

staging

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2017-12-08 13:32:44 -08:00

target

Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2017-11-25 08:37:16 -10:00

tc

…

tee

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

thermal

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux

2017-11-17 14:31:27 -08:00

thunderbolt

Merge tag 'char-misc-4.15-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc

2017-11-16 09:10:59 -08:00

tty

serdev: ttyport: fix tty locking in close

2017-11-28 16:00:50 +01:00

uio

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

usb

usb: xhci: fix panic in xhci_free_virt_devices_depth_first

2017-12-01 15:24:59 +00:00

uwb

treewide: setup_timer() -> timer_setup()

2017-11-21 15:57:07 -08:00

vfio

Merge tag 'vfio-v4.15-rc1' of git://github.com/awilliam/linux-vfio

2017-11-14 16:47:47 -08:00

vhost

vhost: fix skb leak in handle_rx()

2017-12-02 21:31:03 -05:00

video

Merge tag 'fbdev-v4.15' of git://github.com/bzolnier/linux

2017-11-20 21:50:24 -10:00

virt

…

virtio

virtio_mmio: add cleanup for virtio_mmio_remove

2017-12-07 18:30:50 +02:00

vlynq

…

vme

Merge tag 'char-misc-4.15-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc

2017-11-16 09:10:59 -08:00

w1

Merge tag 'char-misc-4.15-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc

2017-11-16 09:10:59 -08:00

watchdog

treewide: setup_timer() -> timer_setup()

2017-11-21 15:57:07 -08:00

xen

Merge tag 'for-linus-4.15-rc3-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip

2017-12-08 12:53:43 -08:00

zorro

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

Kconfig

Merge branches 'pm-cpufreq-sched' and 'pm-opp'

2017-11-13 01:40:52 +01:00

Makefile

usb: build drivers/usb/common/ when USB_SUPPORT is set

2017-11-28 15:17:49 +01:00