mirros/rockchip-kernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
1602f49b58abcb0d34a5f0a29d68e7c1769547aa
rockchip-kernel/drivers
History
David S. Miller 1602f49b58 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts were two cases of simple overlapping changes,
nothing serious.

In the UDP case, we need to add a hlist_add_tail_rcu()
to linux/rculist.h, because we've moved UDP socket handling
away from using nulls lists.

Signed-off-by: David S. Miller <davem@davemloft.net>
2016-04-23 18:51:33 -04:00
..
accessibility
…
acpi
Merge branch 'acpi-processor'
2016-04-02 01:17:36 +02:00
amba
…
android
…
ata
Merge branch 'for-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata
2016-03-18 20:06:46 -07:00
atm
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2016-03-17 21:38:27 -07:00
auxdisplay
…
base
PM / wakeirq: fix wakeirq setting after wakup re-configuration from sysfs
2016-04-07 22:23:47 +02:00
bcma
bcma: fix building without OF_IRQ
2016-03-23 17:52:10 +02:00
block
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
2016-04-15 15:44:10 -07:00
bluetooth
Bluetooth: hci_bcsp: fix code style
2016-04-08 23:01:36 +02:00
bus
Merge tag 'mvebu-fixes-4.6-1' of git://git.infradead.org/linux-mvebu into fixes
2016-04-12 12:35:07 -07:00
cdrom
…
char
hwrng: bcm63xx - fix device tree compilation
2016-04-05 20:23:11 +08:00
clk
clk: qcom: ipq4019: add some fixed clocks for ddrppl and fepll
2016-03-29 16:31:16 -07:00
clocksource
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2016-03-24 10:32:42 -07:00
connector
…
cpufreq
Merge branch 'pm-cpufreq-fixes'
2016-04-21 20:57:46 +02:00
cpuidle
cpuidle: menu: Fall back to polling if next timer event is near
2016-03-21 15:50:28 +01:00
crypto
crypto: ccp - Prevent information leakage on export
2016-04-15 22:13:56 +08:00
dca
…
devfreq
PM / devfreq: Spelling s/frequnecy/frequency/
2016-03-17 02:30:16 +01:00
dio
…
dma
Merge branch 'fix/edma' into fixes
2016-04-16 22:52:03 +05:30
dma-buf
dma-buf: Update docs for SYNC ioctl
2016-03-21 09:26:45 +01:00
edac
Merge tag 'edac_for_4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp
2016-03-16 08:36:55 -07:00
eisa
…
extcon
extcon: palmas: Drop stray IRQF_EARLY_RESUME flag
2016-04-04 08:32:45 +09:00
firewire
Merge tag 'firewire-update2' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394
2016-03-25 08:52:25 -07:00
firmware
Merge branch 'efi-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2016-04-16 15:37:05 -07:00
fmc
…
fpga
…
gpio
gpio: pca953x: Use correct u16 value for register word write
2016-04-08 11:49:47 +02:00
gpu
Merge branch 'exynos-drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into drm-fixes
2016-04-14 13:06:19 +10:00
hid
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
2016-04-11 12:31:09 -07:00
hsi
…
hv
Merge tag 'char-misc-4.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
2016-03-17 13:47:50 -07:00
hwmon
hwmon: (max1111) Return -ENODEV from max1111_read_channel if not instantiated
2016-03-27 10:37:48 -07:00
hwspinlock
…
hwtracing
drivers/hwtracing: make coresight-etm-perf.c explicitly non-modular
2016-03-05 12:19:39 -08:00
i2c
i2c: jz4780: really prevent potential division by zero
2016-04-09 08:36:44 +02:00
ide
ide: palm_bk3710: test clock rate to avoid division by 0
2016-03-20 16:59:27 -04:00
idle
intel_idle: Add KBL support
2016-04-07 22:11:08 +02:00
iio
Merge tag 'iio-fixes-for-4.6b' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus
2016-04-04 13:45:10 -07:00
infiniband
Revert "ib_srpt: Convert to percpu_ida tag allocation"
2016-04-07 18:16:20 -07:00
input
Merge branch 'akpm' (patches from Andrew)
2016-03-25 16:59:11 -07:00
iommu
iommu/vt-d: Silence an uninitialized variable warning
2016-04-07 14:51:47 +02:00
ipack
…
irqchip
irqchip/mbigen: Make CONFIG_HISILICON_IRQ_MBIGEN a hidden option
2016-03-23 12:02:29 +01:00
isdn
mISDN: Fixing missing validation in base_sock_bind()
2016-04-13 23:00:50 -04:00
leds
Merge tag 'platform-drivers-x86-v4.6-1' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86
2016-03-23 17:20:59 -07:00
lguest
lguest, x86/entry/32: Fix handling of guest syscalls using interrupt gates
2016-04-01 08:58:13 +02:00
lightnvm
lightnvm: do not load L2P table if not supported
2016-03-18 18:10:38 -07:00
macintosh
…
mailbox
Merge branch 'mailbox-devel' of git://git.linaro.org/landing-teams/working/fujitsu/integration
2016-04-14 18:40:47 -07:00
mcb
…
md
dm cache metadata: fix cmd_read_lock() acquiring write lock
2016-04-17 11:24:46 -04:00
media
Merge tag 'media/v4.6-3' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
2016-04-05 06:47:50 -07:00
memory
Merge tag 'for-linus-20160324' of git://git.infradead.org/linux-mtd
2016-03-24 19:57:15 -07:00
memstick
drivers/memstick/host/r592.c: avoid gcc-6 warning
2016-03-25 16:37:42 -07:00
message
…
mfd
Merge tag 'mfd-for-linus-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd
2016-03-18 10:15:11 -07:00
misc
lkdtm: do not leak free page on kmalloc failure
2016-04-06 16:22:25 -07:00
mmc
mmc: tegra: Disable UHS-I modes for Tegra124
2016-04-14 11:40:01 +02:00
mtd
Merge tag 'for-linus-20160415' of git://git.infradead.org/linux-mtd
2016-04-15 15:25:09 -07:00
net
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2016-04-23 18:51:33 -04:00
nfc
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2016-03-19 10:05:34 -07:00
ntb
NTB: Remove _addr functions from ntb_hw_amd
2016-03-26 11:44:33 -04:00
nubus
…
nvdimm
libnvdimm, pmem: clarify the write+clear_poison+write flow
2016-04-15 14:59:41 -06:00
nvme
NVMe: Always use MSI/MSI-x interrupts
2016-04-14 14:04:50 -06:00
nvmem
nvmem: mediatek: Fix later provider initialization
2016-03-05 12:20:29 -08:00
of
of_mdio: make of_mdiobus_register_{device|phy}() *void*
2016-04-18 20:58:54 -04:00
oprofile
mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros
2016-04-04 10:41:08 -07:00
parisc
Merge tag 'pci-v4.6-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
2016-03-16 14:45:55 -07:00
parport
…
pci
Merge tag 'pci-v4.6-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
2016-04-18 19:52:47 -07:00
pcmcia
pcmcia: db1xxx_ss: fix last irq_to_gpio user
2016-03-29 22:48:53 +02:00
perf
drivers/perf: arm_pmu: avoid NULL dereference when not using devicetree
2016-03-21 11:36:17 +00:00
phy
Merge tag 'phy-for-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy into usb-testing
2016-03-05 12:22:41 -08:00
pinctrl
Revert "Revert "pinctrl: lantiq: Implement gpio_chip.to_irq""
2016-04-01 15:21:27 +02:00
platform
Merge tag 'platform-drivers-x86-v4.6-2' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86
2016-04-21 08:23:59 -07:00
pnp
PNP / ACPI: add ACPI_RESOURCE_TYPE_SERIAL_BUS as a valid type
2016-03-09 23:50:55 +01:00
power
Merge tag 'pm+acpi-4.6-rc1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
2016-03-25 16:55:37 -07:00
powercap
powercap: intel_rapl: Add missing Haswell model
2016-04-05 03:44:48 +02:00
pps
…
ps3
…
ptp
Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2016-03-15 12:13:56 -07:00
pwm
pwm: fsl-ftm: Use flat regmap cache
2016-04-14 16:54:00 +02:00
rapidio
Convert straggling drivers to new six-argument get_user_pages()
2016-04-02 18:35:05 -05:00
ras
…
regulator
Merge tag 'mfd-for-linus-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd
2016-03-18 10:15:11 -07:00
remoteproc
remoteproc: st: fix check of syscon_regmap_lookup_by_phandle() return value
2016-03-28 16:19:00 -07:00
reset
…
rpmsg
…
rtc
rtc: ds1307: Use irq when available for wakeup-source device
2016-04-21 23:21:00 +02:00
s390
s390/dcssblk: fix possible deadlock in remove vs. per-device attributes
2016-04-15 18:01:44 +02:00
sbus
…
scsi
Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
2016-04-09 12:00:42 -07:00
sfi
…
sh
Merge tag 'v4.5-rc6' into core/resources, to resolve conflict
2016-03-04 12:12:08 +01:00
sn
…
soc
Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2016-03-20 15:40:32 -07:00
spi
Merge remote-tracking branches 'spi/fix/omap2' and 'spi/fix/rockchip' into spi-linus
2016-04-04 10:05:49 -07:00
spmi
…
ssb
…
staging
staging: rtl8188eu: Convert to using IFF_NO_QUEUE
2016-04-16 22:02:13 -04:00
target
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2016-04-14 00:39:15 -04:00
tc
…
thermal
Thermal: Ignore invalid trip points
2016-03-18 14:10:57 +08:00
thunderbolt
…
tty
devpts: clean up interface to pty drivers
2016-04-18 13:43:02 -07:00
uio
…
usb
usb: hcd: out of bounds access in for_each_companion
2016-04-13 12:06:18 -07:00
uwb
…
vfio
Merge tag 'vfio-v4.6-rc1' of git://github.com/awilliam/linux-vfio
2016-03-17 13:05:09 -07:00
vhost
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
2016-03-22 12:41:14 -07:00
video
omapfb: panel-sharp-ls037v7dw01: fix check of gpio_to_desc() return value
2016-04-18 12:18:37 +03:00
virt
…
virtio
virtio: virtio 1.0 cs04 spec compliance for reset
2016-04-07 15:16:39 +03:00
vlynq
…
vme
…
w1
…
watchdog
hpwdt: use nmi_panic() when kernel panics in NMI handler
2016-03-22 15:36:02 -07:00
xen
xen/events: Mask a moving irq
2016-04-04 11:18:00 +01:00
zorro
…
Kconfig
…
Makefile
…