mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-06-10 01:30:29 -04:00
Code Issues Packages Projects Releases Wiki Activity
Files
ced04d15519a15d38b46162b94a1f26b4022116e
linux/drivers
History
Andreas Noever ced04d1551 PCI: Use request_resource_conflict() instead of insert_ for bus numbers 
If a conflict happens during insert_resource_conflict() and all conflicts
fit within the newly inserted resource then they will become children of
the new resource. This is almost certainly not what we want for bus
numbers.

Signed-off-by: Andreas Noever <andreas.noever@gmail.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
2014-02-10 17:12:23 -07:00
..
accessibility
…
acpi
Merge branches 'acpi-processor', 'acpi-hotplug', 'acpi-init', 'acpi-pm' and 'acpica'
2014-01-29 11:47:18 +01:00
amba
…
ata
Merge tag 'pm+acpi-3.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
2014-01-24 15:51:02 -08:00
atm
atm: slight optimization of addr compare
2013-12-26 13:31:34 -05:00
auxdisplay
…
base
Merge tag 'regmap-v3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap
2014-01-25 13:18:00 -08:00
bcma
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2014-01-30 17:20:32 -08:00
block
Merge tag 'stable/for-linus-3.14-rc0-late-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
2014-01-31 08:38:18 -08:00
bluetooth
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
2014-01-08 13:44:29 -05:00
bus
drivers: bus: fix CCI driver kcalloc call parameters swap
2014-01-31 15:15:13 -08:00
cdrom
Merge branch 'for-3.14/drivers' of git://git.kernel.dk/linux-block
2014-01-30 11:40:10 -08:00
char
ipmi: Add missing rv in ipmi_parisc_probe()
2014-01-30 10:02:54 -08:00
clk
Merge tag 'clk-for-linus-3.14-part2' of git://git.linaro.org/people/mike.turquette/linux
2014-01-28 18:44:53 -08:00
clocksource
clocksource: kona: Add basic use of external clock
2014-01-31 21:04:01 -08:00
connector
…
cpufreq
Merge tag 'pm+acpi-3.14-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
2014-01-31 09:23:52 -08:00
cpuidle
powerpc/powernv/cpuidle: Back-end cpuidle driver for powernv platform.
2014-01-29 17:02:24 +11:00
crypto
Merge tag 'drivers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2014-01-23 18:49:36 -08:00
dca
…
devfreq
Merge branches 'pm-cpufreq' and 'pm-devfreq'
2014-01-29 11:48:23 +01:00
dio
…
dma
Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma
2014-01-29 20:27:23 -08:00
edac
Merge branch 'x86-ras-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2014-01-20 12:10:27 -08:00
eisa
Revert "EISA: Initialize device before its resources"
2014-01-17 14:57:29 -07:00
extcon
extcon: gpio: Add power resume support
2014-01-09 09:53:30 +09:00
firewire
firewire: Enable remote DMA above 4 GB
2014-01-20 01:11:13 +01:00
firmware
firmware/google: drop 'select EFI' to avoid recursive dependency
2014-01-27 21:02:40 -08:00
fmc
…
gpio
Merge tag 'drivers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2014-01-23 18:49:36 -08:00
gpu
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
2014-01-29 20:49:12 -08:00
hid
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
2014-01-31 09:31:14 -08:00
hsi
…
hv
hyperv: Add support for physically discontinuous receive buffer
2014-01-27 16:40:45 -08:00
hwmon
hwmon: Fix SENSORS_TMP102 dependencies to eliminate build errors
2014-02-02 17:59:07 +01:00
hwspinlock
…
i2c
Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
2014-01-29 19:56:20 -08:00
ide
drivers: ide: Include appropriate header file in ide-pio-blacklist.c
2014-01-28 23:35:09 -08:00
idle
Merge tag 'pm+acpi-3.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
2014-01-24 15:51:02 -08:00
iio
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2014-01-22 21:21:55 -08:00
infiniband
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
2014-01-31 15:31:23 -08:00
input
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2014-01-24 17:17:30 -08:00
iommu
Merge tag 'iommu-updates-v3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu
2014-01-29 20:00:13 -08:00
ipack
…
irqchip
Merge tag 'mvebu-fixes-3.13-2' of git://git.infradead.org/linux-mvebu into fixes
2014-01-31 14:59:28 -08:00
isdn
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2014-01-25 11:17:34 -08:00
leds
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds
2014-01-28 18:53:01 -08:00
lguest
…
macintosh
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
2014-01-27 21:11:26 -08:00
mailbox
drivers/mailbox/omap: make mbox->irq signed for error handling
2014-01-23 16:36:53 -08:00
md
Merge branch 'for-3.14/drivers' of git://git.kernel.dk/linux-block
2014-01-30 11:40:10 -08:00
media
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
2014-01-31 09:31:14 -08:00
memory
…
memstick
drivers/memstick/host/rtsx_pci_ms.c: fix ms card data transfer bug
2014-01-23 16:37:04 -08:00
message
Merge branch 'for-3.14/core' of git://git.kernel.dk/linux-block
2014-01-30 11:19:05 -08:00
mfd
Merge tag 'regulator-v3.14-2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator
2014-01-25 13:19:10 -08:00
misc
Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
2014-01-29 18:56:27 -08:00
mmc
Merge tag 'mmc-updates-for-3.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc
2014-01-26 11:00:41 -08:00
mtd
Merge tag 'upstream-3.14-rc1' of git://git.infradead.org/linux-ubifs
2014-01-30 20:04:09 -08:00
net
Merge branch 'akpm' (patches from Andrew Morton)
2014-01-30 18:44:44 -08:00
nfc
NFC: nfcmrvl: Fix possible memory leak issue
2014-01-09 01:27:20 +01:00
ntb
…
nubus
…
of
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2014-01-25 11:17:34 -08:00
oprofile
…
parisc
…
parport
Merge tag 'tty-3.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
2014-01-20 16:05:23 -08:00
pci
PCI: Use request_resource_conflict() instead of insert_ for bus numbers
2014-02-10 17:12:23 -07:00
pcmcia
Merge tag 'pci-v3.14-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
2014-01-22 16:39:28 -08:00
phy
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2014-01-25 11:17:34 -08:00
pinctrl
Merge tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2014-01-23 18:45:38 -08:00
platform
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/olof/chrome-platform
2014-01-29 20:06:01 -08:00
pnp
Merge branch 'pnp'
2014-01-12 23:48:18 +01:00
power
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2014-01-25 11:17:34 -08:00
powercap
powercap / RAPL: add support for ValleyView Soc
2013-12-22 01:27:51 +01:00
pps
…
ps3
…
ptp
ptp_pch: Add dependency on HAS_IOMEM
2014-01-15 14:51:22 -08:00
pwm
Merge tag 'pwm/for-3.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm
2014-01-27 08:15:51 -08:00
rapidio
…
regulator
Merge tag 'regulator-v3.14-2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator
2014-01-25 13:19:10 -08:00
remoteproc
…
reset
…
rpmsg
…
rtc
Merge branch 'akpm' (incoming from Andrew)
2014-01-23 19:11:50 -08:00
s390
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm
2014-01-31 08:37:32 -08:00
sbus
sparc: delete non-required instances of include <linux/init.h>
2014-01-28 23:38:23 -08:00
scsi
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
2014-01-31 15:31:23 -08:00
sfi
…
sh
…
sn
…
spi
Merge remote-tracking branch 'agust/next' into next
2014-01-29 16:53:55 +11:00
ssb
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2014-01-30 17:20:32 -08:00
staging
Merge tag 'staging-3.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
2014-02-01 10:29:59 -08:00
target
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
2014-01-31 15:31:23 -08:00
tc
…
thermal
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux
2014-01-24 17:13:49 -08:00
tty
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2014-01-30 17:20:32 -08:00
uio
uio: fix devm_request_irq usage
2013-12-20 08:49:17 -08:00
usb
Merge remote-tracking branch 'agust/next' into next
2014-01-29 16:53:55 +11:00
uwb
uwb: move mutex_lock to error case in uwbd_evt_handle_rc_bp_slot_change
2013-12-20 12:19:44 -08:00
vfio
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
2014-01-27 21:11:26 -08:00
vhost
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
2014-01-31 15:31:23 -08:00
video
parisc/sti_console: prefer Linux fonts over built-in ROM fonts
2014-02-02 20:56:47 +01:00
virt
…
virtio
Merge tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux
2014-01-22 22:24:35 -08:00
vlynq
drivers/vlynq/vlynq.c: fix another resource size off by 1 error
2014-01-23 16:36:55 -08:00
vme
…
w1
drivers/w1/masters/w1-gpio.c: add strong pullup emulation
2014-01-23 16:37:04 -08:00
watchdog
watchdog: w83627hf_wdt: Reset watchdog trigger during initialization
2014-01-28 21:35:40 +01:00
xen
Merge tag 'stable/for-linus-3.14-rc0-late-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
2014-01-31 08:38:18 -08:00
zorro
…
Kconfig
…
Makefile
…