Linus Torvalds
ecb2cf1a6b
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...
Pull networking fixes from David Miller:
"A couple interesting SKB fragment handling fixes, plus the usual small
bits here and there:
1) Fix 64-bit divide build failure on 32-bit platforms in mlx5, from
Tim Gardner.
2) Get rid of a stupid reimplementation on "%*phC" in our sysfs MAC
address printing helper.
3) Fix NETIF_F_SG capability advertisement in hyperv driver, if the
device can't do checksumming offloads then it shouldn't say it can
do SG either. From Haiyang Zhang.
4) bgmac needs to depend on PHYLIB, from Hauke Mehrtens.
5) Don't leak DMA mappings on mapping failures, from Neil Horman.
6) We need to reset the transport header of SKBs in ipv4 before we
attempt to perform early socket demux, just like ipv6 does. From
Eric Dumazet.
7) Add missing locking on vxlan device removal, from Stephen
Hemminger.
8) xen-netfront has to make two passes over an SKB to prepare it for
transfer. One pass calculates the number of slots needed, the
second massages the SKB and fills the slots. Unfortunately, the
first pass doesn't calculate the number of slots properly so we
can end up trying to build a MAX_SKB_FRAGS + 1 SKB which doesn't
work out so well. Fix from Jan Beulich with help and discussion
with several others.
9) Fix a similar problem in tun and macvtap, which have to split up
scatter-gather elements at PAGE_SIZE boundaries. Don't do
zerocopy if it would result in a > MAX_SKB_FRAGS skb. Fixes from
Jason Wang.
10) On receive, once we've decoded the VLAN state completely, clear
skb->vlan_tci. Otherwise demuxed tunnels underneath can trigger
the VLAN code again, corrupting the packet. Fix from Eric
Dumazet"
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
vlan: fix a race in egress prio management
vlan: mask vlan prio bits
macvtap: do not zerocopy if iov needs more pages than MAX_SKB_FRAGS
tuntap: do not zerocopy if iov needs more pages than MAX_SKB_FRAGS
pkt_sched: sch_qfq: remove a source of high packet delay/jitter
xen-netfront: pull on receive skb may need to happen earlier
vxlan: add necessary locking on device removal
hyperv: Fix the NETIF_F_SG flag setting in netvsc
net: Fix sysfs_format_mac() code duplication.
be2net: Fix to avoid hardware workaround when not needed
macvtap: do not assume 802.1Q when send vlan packets
macvtap: fix the missing ret value of TUNSETQUEUE
ipv4: set transport header earlier
mlx5 core: Fix __udivdi3 when compiling for 32 bit arches
bgmac: add dependency to phylib
net/irda: fixed style issues in irlan_eth
ethtool: fixed trailing statements in ethtool
ndisc: bool initializations should use true and false
atl1e: unmap partially mapped skb on dma error and free skb
2013-07-18 20:08:47 -07:00
acpi: delete __cpuinit usage from all acpi files
2013-07-14 19:36:58 -04:00
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2013-07-13 14:52:21 -07:00
Driver core patches for 3.11-rc2
2013-07-18 12:48:40 -07:00
bcma: add support for BCM43142
2013-06-27 13:42:16 -04:00
Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze
2013-07-10 10:16:07 -07:00
ARM SoC device tree changes
2013-07-02 14:23:01 -07:00
drivers/cdrom/cdrom.c: use kzalloc() for failing hardware
2013-07-03 16:07:25 -07:00
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2013-07-13 14:52:21 -07:00
Power management and ACPI updates for 3.11-rc1
2013-07-03 14:35:40 -07:00
clocksource+irqchip: delete __cpuinit usage from all related files
2013-07-14 19:36:57 -04:00
cpufreq: delete __cpuinit usage from all cpufreq files
2013-07-14 19:36:57 -04:00
Power management and ACPI updates for 3.11-rc1
2013-07-03 14:35:40 -07:00
crypto: talitos: use sg_pcopy_to_buffer()
2013-07-09 10:33:30 -07:00
Merge branch 'akpm' (updates from Andrew Morton)
2013-07-03 17:12:13 -07:00
drivers/dma/iop-adma.c: fix new warnings
2013-07-09 10:33:19 -07:00
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2013-07-13 14:52:21 -07:00
drivers: avoid format string in dev_set_name
2013-07-03 16:07:41 -07:00
efivars: check for EFI_RUNTIME_SERVICES
2013-07-11 11:00:31 +01:00
FMC: fix error handling in probe() function
2013-06-24 16:23:25 -07:00
Power management and ACPI updates for 3.11-rc1
2013-07-03 14:35:40 -07:00
Merge branch 'drm/3.11/fixes' of git://linuxtv.org/pinchartl/fbdev into drm-fixes
2013-07-18 20:04:50 +10:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2013-07-04 15:35:08 -07:00
drivers: avoid format string in dev_set_name
2013-07-03 16:07:41 -07:00
drivers: hv: allocate synic structures before hv_synic_init()
2013-06-24 16:24:17 -07:00
Single patch to staticize a local variable
2013-07-18 11:32:36 -07:00
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2013-07-13 14:52:21 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide
2013-07-10 18:15:41 -07:00
For the 3.11 merge we only have one new MFD driver for the Kontron PLD.
2013-07-10 11:10:27 -07:00
Main batch of InfiniBand/RDMA changes for 3.11 merge window:
2013-07-13 12:57:21 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2013-07-13 18:05:13 -07:00
IOMMU Updates for Linux 3.11
2013-07-10 14:46:40 -07:00
clocksource+irqchip: delete __cpuinit usage from all related files
2013-07-14 19:36:57 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2013-07-09 18:24:39 -07:00
leds: mc13783: Fix "uninitialized variable" warning
2013-07-02 08:44:02 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2013-07-04 11:40:58 -07:00
macintosh/windfarm: Remove obsolete cleanup for clientdata
2013-07-01 11:46:56 +10:00
md/raid1: fix bio handling problems in process_checks()
2013-07-18 14:18:04 +10:00
[media] saa7134: Fix unlocked snd_pcm_stop() call
2013-07-15 21:25:14 +02:00
drivers/memstick/host/r592.c: convert to module_pci_driver
2013-07-03 16:08:06 -07:00
drivers: avoid format strings in names passed to alloc_workqueue()
2013-07-03 16:07:41 -07:00
For the 3.11 merge we only have one new MFD driver for the Kontron PLD.
2013-07-10 11:10:27 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2013-07-04 11:40:58 -07:00
MMC highlights for 3.11:
2013-07-10 11:16:00 -07:00
A couple of fixes and clean-ups, allow for assigning user-defined
2013-07-05 12:09:48 -07:00
macvtap: do not zerocopy if iov needs more pages than MAX_SKB_FRAGS
2013-07-18 13:04:25 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2013-07-09 18:24:39 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2013-07-09 18:24:39 -07:00
drivers: delete __cpuinit usage from all remaining drivers files
2013-07-14 19:36:59 -04:00
parisc: fix LMMIO mismatch between PAT length and MASK register
2013-07-09 22:09:16 +02:00
Merge branch 'akpm' (updates from Andrew Morton)
2013-07-03 17:12:13 -07:00
Merge branch 'akpm' (updates from Andrew Morton)
2013-07-03 17:12:13 -07:00
Driver core patches for 3.11-rc1
2013-07-02 11:44:19 -07:00
Pin control changes for the v3.11 kernel cycle:
2013-07-03 11:48:03 -07:00
x86 platform drivers: fix gpio leak
2013-07-10 15:42:51 -04:00
Power management and ACPI updates for 3.11-rc1
2013-07-03 14:35:40 -07:00
Nothing exciting this time, just assorted fixes and cleanups.
2013-07-10 11:13:00 -07:00
pps-gpio: add device-tree binding and support
2013-07-03 16:08:06 -07:00
build some drivers only when compile-testing
2013-06-24 16:41:32 -07:00
pwm: pwm-tiehrpwm: Use clk_enable/disable instead clk_prepare/unprepare.
2013-06-26 23:23:54 +02:00
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2013-07-13 14:52:21 -07:00
For the 3.11 merge we only have one new MFD driver for the Kontron PLD.
2013-07-10 11:10:27 -07:00
Trivial remoteproc fixes by Suman Anna, Wei Yongjun and Thomas Meyer.
2013-07-11 12:35:09 -07:00
For the 3.11 merge we only have one new MFD driver for the Kontron PLD.
2013-07-10 11:10:27 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2013-07-09 18:24:39 -07:00
SCSI for-linus on 20130713
2013-07-13 17:41:21 -07:00
Merge branch 'pm-assorted'
2013-06-28 13:01:40 +02:00
Merge remote-tracking branch 'spi/fix/xilinx' into spi-linus
2013-07-15 11:46:16 +01:00
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2013-07-13 14:52:21 -07:00
staging: line6: Fix unlocked snd_pcm_stop() call
2013-07-15 21:25:14 +02:00
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
2013-07-11 12:57:19 -07:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux
2013-07-11 12:26:08 -07:00
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2013-07-13 14:52:21 -07:00
uio: use vma_pages() to replace (vm_end - vm_start) >> PAGE_SHIFT
2013-07-03 16:07:26 -07:00
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2013-07-13 14:52:21 -07:00
drivers: avoid format string in dev_set_name
2013-07-03 16:07:41 -07:00
vfio Updates for v3.11
2013-07-10 14:50:08 -07:00
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
2013-07-11 12:57:19 -07:00
uvesafb: Really allow mtrr being 0, as documented and warn()ed
2013-07-16 10:24:28 +10:00
No real surprises.
2013-07-10 14:50:58 -07:00
vme: vme_tsi148.c: fix error return code in tsi148_probe()
2013-06-24 16:23:25 -07:00
drivers/w1/slaves/w1_ds2408.c: add magic sequence to disable P0 test mode
2013-07-03 16:08:06 -07:00
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2013-07-13 14:52:21 -07:00
drivers: delete __cpuinit usage from all remaining drivers files
2013-07-14 19:36:59 -04:00
zorro: switch to fixed_size_llseek()
2013-06-29 12:57:28 +04:00
For the 3.11 merge we only have one new MFD driver for the Kontron PLD.
2013-07-10 11:10:27 -07:00
For the 3.11 merge we only have one new MFD driver for the Kontron PLD.
2013-07-10 11:10:27 -07:00
ecb2cf1a6b