admin/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2025-12-07 20:06:24 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
18ba7e4fe51d15a0ec94de1f3cf74c3cc82b5f90
linux/drivers
History
Linus Torvalds a9be22425e Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Pull networking fixes from David Miller:

 1) Fix checksumming regressions, from Tom Herbert.

 2) Undo unintentional permissions changes for SCTP rto_alpha and
    rto_beta sysfs knobs, from Denial Borkmann.

 3) VXLAN, like other IP tunnels, should advertize it's encapsulation
    size using dev->needed_headroom instead of dev->hard_header_len.
    From Cong Wang.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
  net: sctp: fix permissions for rto_alpha and rto_beta knobs
  vxlan: Checksum fixes
  net: add skb_pop_rcv_encapsulation
  udp: call __skb_checksum_complete when doing full checksum
  net: Fix save software checksum complete
  net: Fix GSO constants to match NETIF flags
  udp: ipv4: do not waste time in __udp4_lib_mcast_demux_lookup
  vxlan: use dev->needed_headroom instead of dev->hard_header_len
  MAINTAINERS: update cxgb4 maintainer
2014-06-15 16:37:03 -10:00
..
accessibility
printk: move braille console support into separate braille.[ch] files
2013-07-31 14:41:03 -07:00
acpi
Merge branch 'pm-sleep'
2014-06-12 13:43:08 +02:00
amba
Merge tag 'drivers-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2014-04-05 15:37:40 -07:00
ata
Merge branch 'for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata
2014-06-09 14:58:36 -07:00
atm
atm: fore200e.c: Cleaning up uninitialized variables
2014-06-02 17:11:03 -07:00
auxdisplay
…
base
Merge tag 'pm+acpi-3.16-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
2014-06-12 13:14:19 -07:00
bcma
…
block
Merge git://git.infradead.org/users/willy/linux-nvme
2014-06-15 15:58:03 -10:00
bluetooth
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2014-06-12 14:27:40 -07:00
bus
Merge tag 'drivers-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc into next
2014-06-02 16:35:49 -07:00
cdrom
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
2014-06-11 08:41:17 -07:00
char
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2014-06-12 10:30:18 -07:00
clk
Merge tag 'clk-for-linus-3.16-part2' of git://git.linaro.org/people/mike.turquette/linux
2014-06-15 16:02:20 -10:00
clocksource
Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into next
2014-06-04 15:57:20 -07:00
connector
Merge tag 'char-misc-3.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc into next
2014-06-03 08:06:56 -07:00
cpufreq
Merge branch 'pm-cpufreq'
2014-06-12 13:43:02 +02:00
cpuidle
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
2014-06-12 20:11:38 -07:00
crypto
crypto/nx: disable NX on little endian builds
2014-06-11 17:03:19 +10:00
dca
dca: convert to idr_alloc()
2013-02-27 19:10:15 -08:00
devfreq
PM / devfreq: remove checks for CONFIG_EXYNOS_ASV
2014-05-24 22:33:51 +09:00
dio
…
dma
Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma
2014-06-10 10:28:45 -07:00
edac
Merge tag 'pci-v3.16-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci into next
2014-06-02 12:15:19 -07:00
eisa
…
extcon
extcon: palmas: Use devm_extcon_dev_allocate for extcon_dev
2014-04-29 09:52:12 +09:00
firewire
Merge tag 'sound-3.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound into next
2014-06-04 09:08:25 -07:00
firmware
Merge branch 'arm64-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into next
2014-06-05 13:15:32 -07:00
fmc
…
gpio
gpio: of: Fix handling for deferred probe for -gpio suffix
2014-06-12 09:57:00 +02:00
gpu
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
2014-06-12 11:32:30 -07:00
hid
Merge tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux
2014-06-11 16:09:14 -07:00
hsi
hsi: omap_ssi_port: use normal module refcounting
2014-06-05 00:59:05 +02:00
hv
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2014-06-12 14:27:40 -07:00
hwmon
hwmon: vexpress: Use devm helper for hwmon device registration
2014-06-12 08:36:50 -07:00
hwspinlock
…
i2c
Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux into next
2014-06-06 12:26:57 -07:00
ide
block: remove struct request buffer member
2014-04-15 14:03:02 -06:00
idle
…
iio
Merge tag 'staging-3.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging into next
2014-06-03 08:34:00 -07:00
infiniband
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
2014-06-12 22:38:32 -07:00
input
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2014-06-09 18:46:02 -07:00
iommu
Merge tag 'iommu-updates-v3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu into next
2014-06-06 11:48:46 -07:00
ipack
…
irqchip
Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into next
2014-06-04 15:59:13 -07:00
isdn
isdn/capi: fix (middleware) device nodes
2014-06-04 23:13:41 -07:00
leds
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds
2014-06-12 13:08:09 -07:00
lguest
…
macintosh
…
mailbox
drivers/mailbox/omap: make mbox->irq signed for error handling
2014-01-23 16:36:53 -08:00
mcb
mcb: Add support for shared PCI IRQs
2014-05-27 17:38:11 -07:00
md
Merge tag 'dm-3.16-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm
2014-06-12 13:33:29 -07:00
media
Merge branch 'topic/omap3isp' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
2014-06-12 23:04:28 -07:00
memory
memory: mvebu-devbus: add a devbus, keep-config property
2014-04-29 13:17:10 +00:00
memstick
…
message
mptfusion: fix msgContext in mptctl_hp_hostinfo
2014-05-28 18:14:16 +02:00
mfd
Merge tag 'mfd-for-linus-3.16-1' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd
2014-06-12 12:42:32 -07:00
misc
Merge branch 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into next
2014-06-03 15:48:23 -07:00
mmc
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2014-06-12 14:27:40 -07:00
mtd
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2014-06-12 10:30:18 -07:00
net
vxlan: Checksum fixes
2014-06-15 01:00:50 -07:00
nfc
NFC: trf7970a: Add support for Felica Type 3 tags
2014-05-26 01:28:28 +02:00
ntb
…
nubus
kernel/printk: use symbolic defines for console loglevels
2014-06-04 16:54:17 -07:00
of
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2014-06-12 14:27:40 -07:00
oprofile
…
parisc
…
parport
parport: convert use of typedef ctl_table to struct ctl_table
2014-06-06 16:08:15 -07:00
pci
Merge tag 'pci-v3.16-changes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
2014-06-12 13:20:24 -07:00
pcmcia
pcmcia: Use pci_is_bridge() to simplify code
2014-05-27 14:58:24 -06:00
phy
phy: usb: sunxi: Introduce Allwinner A31 USB PHY support
2014-05-14 19:41:13 +05:30
pinctrl
Merge tag 'pinctrl-v3.16-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl into next
2014-06-03 11:20:32 -07:00
platform
Merge branch 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86
2014-06-10 16:58:32 -07:00
pnp
Merge branches 'pnp', 'powercap', 'pm-runtime' and 'pm-opp'
2014-06-03 23:13:00 +02:00
power
Merge tag 'pm+acpi-3.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm into next
2014-06-04 08:57:16 -07:00
powercap
…
pps
drivers/pps/clients/pps-gpio.c: remove redundant of_match_ptr
2013-11-13 12:09:35 +09:00
ps3
ps3-vuart: don't use PREPARE_WORK
2014-03-07 10:24:48 -05:00
ptp
…
pwm
Merge tag 'pwm/for-3.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm
2014-06-11 14:06:55 -07:00
rapidio
rapidio/tsi721: use pci_enable_msix_exact() instead of pci_enable_msix()
2014-06-06 16:08:13 -07:00
regulator
Merge tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux
2014-06-11 16:09:14 -07:00
remoteproc
…
reset
Merge tag 'drivers-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc into next
2014-06-02 16:35:49 -07:00
rpmsg
Merge tag 'rpmsg-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/rpmsg
2013-05-07 14:02:00 -07:00
rtc
rtc: s5m: consolidate two device type switch statements
2014-06-10 15:34:47 -07:00
s390
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2014-06-12 14:27:40 -07:00
sbus
…
scsi
Merge tag 'scsi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
2014-06-14 19:49:48 -05:00
sfi
…
sh
Merge tag 'renesas-sh-drivers-for-v3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next
2014-06-06 11:44:09 -07:00
sn
…
soc
soc: qcom: fix of_device_id table
2014-05-26 21:27:09 +02:00
spi
Merge remote-tracking branch 'spi/topic/workqueue' into spi-next
2014-06-02 17:08:43 +01:00
spmi
…
ssb
…
staging
Merge branch 'topic/omap3isp' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
2014-06-12 23:04:28 -07:00
target
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
2014-06-12 22:38:32 -07:00
tc
…
thermal
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux
2014-06-11 14:26:21 -07:00
tty
Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile
2014-06-11 16:50:01 -07:00
uio
uio: fix vma io range check in mmap
2014-05-27 14:11:06 -07:00
usb
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2014-06-12 14:27:40 -07:00
uwb
uwb: fix variable set but not used warnings
2014-05-27 15:18:48 -07:00
vfio
Merge tag 'vfio-v3.16-rc1' of git://github.com/awilliam/linux-vfio into next
2014-06-07 20:12:15 -07:00
vhost
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
2014-06-12 22:38:32 -07:00
video
Merge tag 'backlight-for-linus-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight
2014-06-12 12:45:50 -07:00
virt
drivers: clean-up prom.h implicit includes
2013-10-09 20:04:04 -05:00
virtio
virtio: virtio_break_device() to mark all virtqueues broken.
2014-04-28 11:34:13 +09:30
vlynq
…
vme
…
w1
Merge commit '3cf2f34' into sched/core, to fix build error
2014-06-12 13:46:37 +02:00
watchdog
watchdog: add Intel MID watchdog driver support
2014-06-10 21:48:16 +02:00
xen
Merge commit '3cf2f34' into sched/core, to fix build error
2014-06-12 13:46:37 +02:00
zorro
…
Kconfig
…
Makefile
Merge tag 'char-misc-3.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc into next
2014-06-03 08:06:56 -07:00