Linus Torvalds
596fa9e6ef
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...
Pull networking fixes from David Miller:
1) Fix RTNL locking in batman-adv, from Matthias Schiffer.
2) Don't allow non-passthrough macvlan devices to set NOPROMISC via
netlink, otherwise we can end up with corrupted promisc counter
values on the device. From Michael S Tsirkin.
3) Fix stmmac driver build with debugging defines enabled, from Dinh
Nguyen.
4) Make sure name string we give in socket address in AF_PACKET is NULL
terminated, from Daniel Borkmann.
5) Fix leaking of two uninitialized bytes of memory to userspace in
l2tp, from Guillaume Nault.
6) Clear IPCB(skb) before tunneling otherwise we touch dangling IP
options state and crash. From Saurabh Mohan.
7) Fix suspend/resume for davinci_mdio by using suspend_late and
resume_early. From Mugunthan V N.
8) Don't tag ip_tunnel_init_net and ip_tunnel_delete_net with
__net_{init,exit}, they can be called outside of those contexts.
From Eric Dumazet.
9) Fix RX length error in sh_eth driver, from Yoshihiro Shimoda.
10) Fix missing sctp_outq initialization in some code paths of SCTP
stack, from Neil Horman.
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (21 commits)
sctp: fully initialize sctp_outq in sctp_outq_init
netiucv: Hold rtnl between name allocation and device registration.
tulip: Properly check dma mapping result
net: sh_eth: fix incorrect RX length error if R8A7740
ip_tunnel: remove __net_init/exit from exported functions
drivers: net: davinci_mdio: restore mdio clk divider in mdio resume
drivers: net: davinci_mdio: moving mdio resume earlier than cpsw ethernet driver
net/ipv4: ip_vti clear skb cb before tunneling.
tg3: Wait for boot code to finish after power on
l2tp: Fix sendmsg() return value
l2tp: Fix PPP header erasure and memory leak
bonding: fix igmp_retrans type and two related races
bonding: reset master mac on first enslave failure
packet: packet_getname_spkt: make sure string is always 0-terminated
net: ethernet: stmicro: stmmac: Fix compile error when STMMAC_XMIT_DEBUG used
be2net: Fix 32-bit DMA Mask handling
xen-netback: don't de-reference vif pointer after having called xenvif_put()
macvlan: don't touch promisc without passthrough
batman-adv: Don't handle address updates when bla is disabled
batman-adv: forward late OGMs from best next hop
...
2013-06-15 11:47:56 -10:00
ACPI / video: Do not bind to device objects with a scan handler
2013-06-10 13:00:29 +02:00
Merge branch 'for-3.10-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata
2013-06-03 17:55:09 +09:00
Merge remote-tracking branch 'regmap/fix/debugfs' into regmap-linus
2013-06-03 18:07:38 +01:00
bcma: add more core IDs
2013-05-17 14:31:05 -04:00
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
2013-06-12 16:42:39 -07:00
Bluetooth: btmrvl: support Marvell Bluetooth device SD8897
2013-06-12 10:20:54 -04:00
block_device_operations->release() should return void
2013-05-07 02:16:21 -04:00
random: fix accounting race condition with lockless irq entropy_count update
2013-05-24 16:22:52 -07:00
clk: mxs: Include clk mxs header file
2013-05-30 18:27:24 -07:00
ARM: late Exynos multiplatform changes
2013-05-07 11:28:42 -07:00
cpufreq: cpufreq-cpu0: use the exact frequency for clk_set_rate()
2013-06-05 13:51:29 +02:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
2013-06-10 13:25:50 -07:00
dmatest: do not allow to interrupt ongoing tests
2013-06-08 02:13:44 +05:30
amd64_edac: Fix bogus sysfs file permissions
2013-05-21 09:13:11 +02:00
Removal of GENERIC_GPIO for v3.10
2013-05-09 09:59:16 -07:00
IEEE 1394 (FireWire) subsystem changes:
2013-05-09 10:11:48 -07:00
efivar: fix oops in efivar_update_sysfs_entries() caused by memory reuse
2013-05-13 20:20:02 +01:00
GPIO fixes for the v3.10 series:
2013-05-23 18:24:10 -07:00
Merge tag 'drm-intel-fixes-2013-06-11' of git://people.freedesktop.org/~danvet/drm-intel into drm-fixes
2013-06-11 19:38:27 +10:00
HID: multitouch: prevent memleak with the allocated name
2013-06-12 11:13:38 +02:00
Drivers: hv: Fix a bug in get_vp_index()
2013-05-21 09:56:55 -07:00
hwmon: (adm1021) Strengthen chip detection for ADM1021, LM84 and MAX1617
2013-06-07 12:29:31 -07:00
A single patch from Vincent extending OMAP's hwspinlock support to OMAP5.
2013-05-07 14:01:27 -07:00
Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
2013-05-21 11:11:45 -07:00
block_device_operations->release() should return void
2013-05-07 02:16:21 -04:00
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
2013-05-11 15:23:17 -07:00
iio:inkern: Fix typo/bug in convert raw to processed.
2013-06-04 18:46:45 +01:00
Merge branches 'iser' and 'qib' into for-next
2013-06-04 17:06:46 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2013-06-05 09:11:06 +09:00
IOMMU Updates for Linux v3.10
2013-05-06 14:59:13 -07:00
irqdomain bug fixes for v3.10-rc4
2013-06-08 15:50:42 -07:00
isdn/kcapi: fix a small underflow
2013-05-20 13:38:14 -07:00
drivers/leds/leds-ot200.c: fix error caused by shifted mask
2013-05-24 16:22:51 -07:00
lguest: clear cached last cpu when guest_set_pgd() called.
2013-05-08 10:49:18 +09:30
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
2013-05-02 10:16:16 -07:00
A few bugfixes for md
2013-06-13 10:13:29 -07:00
fbdev: fixes for 3.10-rc4
2013-06-01 19:53:41 +09:00
drivers/memory: don't check resource with devm_ioremap_resource
2013-05-18 11:55:52 +02:00
block_device_operations->release() should return void
2013-05-07 02:16:21 -04:00
Merge branch 'for-3.10/core' of git://git.kernel.dk/linux-block
2013-05-08 10:13:35 -07:00
This is the first batch of MFD fixes for 3.10.
2013-05-22 07:18:41 -07:00
Char / Misc fixes for 3.10-rc6
2013-06-14 19:15:36 -10:00
mmc: omap_hsmmc: Skip platform_get_resource_byname() for dt case
2013-05-26 14:23:11 -04:00
drivers/mtd/nand: don't check resource with devm_ioremap_resource
2013-05-18 11:55:55 +02:00
tulip: Properly check dma mapping result
2013-06-13 17:09:40 -07:00
NFC: mei: Do not disable MEI devices from their remove routine
2013-05-21 10:48:41 +02:00
NTB: Multiple NTB client fix
2013-05-15 10:58:22 -07:00
nubus: Kill nubus_proc_detach_device()
2013-05-04 14:47:26 -04:00
of: Fix locking vs. interrupts
2013-06-13 22:12:14 +01:00
parisc/PCI: lba: fix: convert to pci_create_root_bus() for correct root bus resources (v2)
2013-06-01 14:44:25 +02:00
parisc: parport0: fix this legacy no-device port driver!
2013-06-01 14:46:42 +02:00
aerdrv: Move cper_print_aer() call out of interrupt context
2013-05-30 10:51:20 -07:00
Renesas ARM based SoC fixes for v3.10
2013-06-07 18:11:02 -07:00
x86 / platform / hp_wmi: Fix bluetooth_rfkill misuse in hp_wmi_rfkill_setup()
2013-06-01 23:51:48 +02:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
2013-05-02 10:16:16 -07:00
Last minute one-liners: wrong kfree usage fix, module alias fixup and
2013-05-25 20:32:49 -07:00
ptp_pch: fix error handling in pch_probe()
2013-05-25 21:24:15 -07:00
drivers/pwm: don't check resource with devm_ioremap_resource
2013-05-18 11:55:58 +02:00
rapidio/tsi721: fix bug in MSI interrupt handling
2013-05-24 16:22:51 -07:00
Merge remote-tracking branch 'regulator/fix/palmas' into regulator-linus
2013-05-30 11:58:40 +01:00
This pull request contains:
2013-05-07 14:04:56 -07:00
A small pull request consisting of:
2013-05-07 14:02:00 -07:00
rtc-at91rm9200: use shadow IMR on at91sam9x5
2013-06-12 16:29:46 -07:00
netiucv: Hold rtnl between name allocation and device registration.
2013-06-13 17:41:18 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
2013-06-01 20:05:20 +09:00
Merge remote-tracking branch 'spi/fix/xilinx' into spi-linus
2013-06-04 18:52:05 +01:00
- Lots of cleanups from Artem, including deletion of some obsolete drivers
2013-05-09 10:15:46 -07:00
Staging driver fixes for 3.10-rc5
2013-06-06 16:34:11 -07:00
iscsi-target: Fix iscsit_free_cmd() se_cmd->cmd_kref shutdown handling
2013-05-31 01:21:28 -07:00
drivers/thermal: don't check resource with devm_ioremap_resource
2013-05-18 11:57:30 +02:00
Revert "serial: 8250: Make SERIAL_8250_RUNTIME_UARTS work correctly"
2013-06-03 10:08:28 -07:00
uio: UIO_DMEM_GENIRQ should depend on HAS_DMA
2013-05-21 10:13:23 -07:00
usb: chipidea: fix id change handling
2013-06-11 16:18:05 -07:00
vfio: fix crash on rmmod
2013-06-05 08:54:16 -06:00
vhost: fix ubuf_info cleanup
2013-06-11 02:46:21 -07:00
atmel_lcdfb: blank the backlight on remove
2013-06-01 03:18:55 +08:00
drivers/w1/masters: don't check resource with devm_ioremap_resource
2013-05-18 11:58:03 +02:00
drivers/watchdog: don't check resource with devm_ioremap_resource
2013-05-18 11:58:04 +02:00
xen/tmem: Don't over-write tmem_frontswap_poolid after tmem_frontswap_init set it.
2013-06-10 10:14:33 -04:00
ARM: arm-soc driver changes for 3.10
2013-05-04 12:31:18 -07:00
ARM: arm-soc driver changes for 3.10
2013-05-04 12:31:18 -07:00
596fa9e6ef