iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
linux/drivers
History
David S. Miller c85d6975ef Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/ethernet/mellanox/mlx4/cmd.c
	net/core/fib_rules.c
	net/ipv4/fib_frontend.c

The fib_rules.c and fib_frontend.c conflicts were locking adjustments
in 'net' overlapping addition and removal of code in 'net-next'.

The mlx4 conflict was a bug fix in 'net' happening in the same
place a constant was being replaced with a more suitable macro.

Signed-off-by: David S. Miller <davem@davemloft.net>
2015-04-06 22:34:15 -04:00
..
accessibility
…
acpi
Revert "x86/PCI: Refine the way to release PCI IRQ resources"
2015-03-20 14:56:19 +01:00
amba
ARM: 8256/1: driver coamba: add device binding path 'driver_override'
2015-02-10 10:23:15 +00:00
android
android: binder: fix binder mmap failures
2015-03-01 18:43:51 -08:00
ata
libata: Blacklist queued TRIM on Samsung SSD 850 Pro
2015-03-27 15:22:46 -04:00
atm
drivers: atm: nicstar: remove ifdef'd out skb destructors
2015-03-10 13:34:53 -04:00
auxdisplay
…
base
regmap: Fix for v4.0
2015-03-24 16:42:54 -07:00
bcma
bcma: gpio: use predictable base for all BCM47XX buses
2015-03-20 09:08:56 +02:00
block
NVMe: Initialize device list head before starting
2015-03-23 09:35:12 -06:00
bluetooth
Bluetooth: hci_uart: Add setup callback
2015-03-25 17:31:58 +01:00
bus
ARM: SoC platform changes
2015-02-17 09:27:54 -08:00
cdrom
…
char
Not entirely surprising: the ongoing QEMU work on virtio 1.0 has revealed
2015-03-17 10:36:01 -07:00
clk
The clk fixes for 4.0-rc4 comprise three themes. First are the usual
2015-03-15 15:07:08 -07:00
clocksource
clocksource/drivers/sun5i: Fix cpufreq interaction with sched_clock()
2015-03-26 10:59:40 +01:00
connector
…
coresight
coresight: fix function etm_writel_cp14() parameter order
2015-02-04 10:42:55 -08:00
cpufreq
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal
2015-03-06 13:43:33 -08:00
cpuidle
cpuidle: mvebu: Update cpuidle thresholds for Armada XP SOCs
2015-03-13 18:31:29 +01:00
crypto
Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma
2015-02-18 08:49:20 -08:00
dca
…
devfreq
Merge branches 'pm-cpufreq', 'pm-cpuidle', 'pm-devfreq', 'pm-opp' and 'pm-tools'
2015-02-13 21:39:06 +01:00
dio
…
dma
dmaengine: moxart-dma: Fix memory leak when stopping a running transfer
2015-03-30 23:17:08 +05:30
dma-buf
…
edac
* A fix to sb_edac for proper detection on SNB machines
2015-02-19 11:18:14 -08:00
eisa
…
extcon
…
firewire
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-03-03 21:16:48 -05:00
firmware
* Fix integer overflow issue in the DMI SMBIOS 3.0 code when
2015-03-31 10:45:47 +02:00
fmc
…
gpio
gpio: syscon: reduce message level when direction reg offset not in dt
2015-03-27 11:17:08 +01:00
gpu
Merge branch 'drm-fixes-4.0' of git://people.freedesktop.org/~agd5f/linux into drm-fixes
2015-04-03 09:28:55 +10:00
hid
HID: wacom: check for wacom->shared before following the pointer
2015-03-17 20:59:55 +01:00
hsi
…
hv
Char / Misc patches for 3.20-rc1
2015-02-15 10:48:44 -08:00
hwmon
hwmon: (ads7828) Check return value of devm_regmap_init_i2c
2015-02-22 20:10:30 -08:00
hwspinlock
…
i2c
Revert "i2c: core: Dispose OF IRQ mapping at client removal time"
2015-03-12 10:23:05 +01:00
ide
ide_tape: convert jiffies with jiffies_to_msecs
2015-03-18 23:25:57 -04:00
idle
intel_idle: Add ->enter_freeze callbacks
2015-02-15 19:40:09 +01:00
iio
iio: imu: Use iio_trigger_get for indio_dev->trig assignment
2015-03-28 13:51:40 +00:00
infiniband
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-04-06 22:34:15 -04:00
input
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2015-04-06 14:10:08 -07:00
iommu
iommu/vt-d: Remove unused variable
2015-03-24 15:39:26 +01:00
ipack
…
irqchip
Merge branch 'irqchip/urgent-gic' into irqchip/urgent
2015-03-29 19:34:05 +00:00
isdn
isdn/gigaset: restructure modem response parser (4)
2015-03-23 16:47:24 -04:00
leds
leds: leds-gpio: Pass on error codes unmodified
2015-02-02 14:36:10 -08:00
lguest
lguest: now needs PCI_DIRECT.
2015-04-01 10:29:05 -07:00
macintosh
…
mailbox
Merge branch 'mailbox-devel' of git://git.linaro.org/landing-teams/working/fujitsu/integration
2015-02-11 12:56:40 -08:00
mcb
mcb: Fix error path of mcb_pci_probe
2015-02-03 15:48:51 -08:00
md
. Fix DM core device cleanup regression -- due to a latent race that was
2015-03-26 14:53:47 -07:00
media
net: Kill dev_rebuild_header
2015-03-02 16:43:41 -05:00
memory
memory/fsl-corenet-cf: Add t1040 support
2015-01-29 22:57:43 -06:00
memstick
…
message
i2o: move to staging
2015-02-03 15:58:39 -08:00
mfd
mfd: kempld-core: Fix callback return value check
2015-03-12 09:27:58 +00:00
misc
mei: make device disabled on stop unconditionally
2015-03-01 19:34:50 -08:00
mmc
mmc: pwrseq_simple: fix error path in mmc_pwrseq_simple_alloc
2015-03-19 11:26:35 +01:00
mtd
This pull request fixes a bug introduced during the v4.0 merge window where we
2015-03-21 10:36:44 -07:00
net
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-04-06 22:34:15 -04:00
nfc
NFC: nci: Move NFCEE discovery logic
2015-02-04 09:15:18 +01:00
ntb
…
nubus
…
of
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-04-06 22:34:15 -04:00
oprofile
…
parisc
…
parport
…
pci
PCI updates for v4.0:
2015-03-12 09:45:46 -07:00
pcmcia
Revert "pcmcia: add a new resource manager for non ISA systems"
2015-03-11 14:21:23 +01:00
phy
phy: omap-usb2: Fix missing clk_prepare call when using old dt name
2015-03-13 17:14:39 +05:30
pinctrl
pinctrl: sun4i: GPIOs configured as irq must be set to input before reading
2015-03-18 10:56:46 +01:00
platform
Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2015-02-21 11:12:07 -08:00
pnp
Merge branches 'pnp', 'pm-cpuidle' and 'pm-cpufreq'
2015-02-21 04:29:16 +01:00
power
…
powercap
powercap / RAPL: handle domains with different energy units
2015-03-13 23:18:44 +01:00
pps
…
ps3
…
ptp
ptp: remove 32 bit get/set methods.
2015-03-31 12:01:19 -04:00
pwm
pwm: tegra: Use NSEC_PER_SEC
2015-02-18 08:40:29 +01:00
rapidio
Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma
2015-02-18 08:49:20 -08:00
ras
…
regulator
Merge remote-tracking branches 'regulator/fix/doc' and 'regulator/fix/palmas' into regulator-linus
2015-03-23 11:43:42 -07:00
remoteproc
…
reset
…
rpmsg
virtio_rpmsg: set DRIVER_OK before using device
2015-03-13 15:55:42 +10:30
rtc
drivers/rtc/rtc-mrst: fix suspend/resume
2015-03-25 16:20:30 -07:00
s390
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-03-09 23:38:02 -04:00
sbus
…
scsi
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-04-02 16:16:53 -04:00
sfi
…
sh
drivers: sh: Disable PM runtime for multi-platform r8a7740 with genpd
2015-02-24 07:26:12 +09:00
sn
…
soc
ARM: SoC driver updates
2015-02-17 09:38:59 -08:00
spi
Merge remote-tracking branches 'spi/fix/dw', 'spi/fix/queue' and 'spi/fix/qup' into spi-linus
2015-03-24 10:38:44 -07:00
spmi
…
ssb
ssb: Silence warning for unknown backplane revision
2015-03-03 15:49:40 +02:00
staging
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-04-06 22:34:15 -04:00
target
target: do not reject FUA CDBs when write cache is enabled but emulate_write_cache is 0
2015-03-19 23:26:46 -07:00
tc
…
thermal
thermal: Make sysfs attributes of cooling devices default attributes
2015-03-05 01:47:57 -04:00
thunderbolt
…
tty
tty: serial: fsl_lpuart: clear receive flag on FIFO flush
2015-03-26 23:13:14 +01:00
uio
…
usb
USB-serial fixes for v4.0-rc6
2015-04-01 13:42:58 +02:00
uwb
USB patches for 3.20-rc1
2015-02-15 10:24:55 -08:00
vfio
vfio-pci: Add missing break to enable VFIO_PCI_ERR_IRQ_INDEX
2015-03-12 09:51:38 -06:00
vhost
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-03-23 22:22:43 -04:00
video
OMAPDSS: fix regression with display sysfs files
2015-02-26 10:23:15 +02:00
virt
…
virtio
virtio_mmio: fix access width for mmio
2015-03-17 12:12:21 +10:30
vlynq
…
vme
…
w1
…
watchdog
watchdog: imgpdc: Fix default heartbeat
2015-03-27 08:47:50 +01:00
xen
xen: regression fixes for 4.0-rc6
2015-04-02 13:53:53 -07:00
zorro
…
Kconfig
i2o: move to staging
2015-02-03 15:58:39 -08:00
Makefile
…