summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-06-17Merge remote-tracking branch 'asoc/topic/x86' into asoc-nextMark Brown
2013-06-17Merge remote-tracking branch 'asoc/topic/wm8994' into asoc-nextMark Brown
2013-06-17Merge remote-tracking branch 'asoc/topic/wm8962' into asoc-nextMark Brown
2013-06-17Merge remote-tracking branch 'asoc/topic/wm0010' into asoc-nextMark Brown
2013-06-17Merge remote-tracking branch 'asoc/topic/ux500' into asoc-nextMark Brown
2013-06-17Merge remote-tracking branch 'asoc/topic/tegra' into asoc-nextMark Brown
2013-06-17Merge remote-tracking branch 'asoc/topic/ssm2518' into asoc-nextMark Brown
2013-06-17Merge remote-tracking branch 'asoc/topic/spear' into asoc-nextMark Brown
2013-06-17Merge remote-tracking branch 'asoc/topic/spdif' into asoc-nextMark Brown
2013-06-17Merge remote-tracking branch 'asoc/topic/sn95031' into asoc-nextMark Brown
2013-06-17Merge remote-tracking branch 'asoc/topic/sgtl5000' into asoc-nextMark Brown
2013-06-17Merge remote-tracking branch 'asoc/topic/samsung' into asoc-nextMark Brown
2013-06-17Merge remote-tracking branch 'asoc/topic/rt5640' into asoc-nextMark Brown
2013-06-17Merge remote-tracking branch 'asoc/topic/pxa' into asoc-nextMark Brown
2013-06-17Merge remote-tracking branch 'asoc/topic/omap' into asoc-nextMark Brown
2013-06-17Merge remote-tracking branch 'asoc/topic/mxs' into asoc-nextMark Brown
2013-06-17Merge remote-tracking branch 'asoc/topic/max98090' into asoc-nextMark Brown
2013-06-17Merge remote-tracking branch 'asoc/topic/kirkwood' into asoc-nextMark Brown
2013-06-17Merge remote-tracking branch 'asoc/topic/jz4740' into asoc-nextMark Brown
2013-06-17Merge remote-tracking branch 'asoc/topic/hdmi' into asoc-nextMark Brown
2013-06-17Merge remote-tracking branch 'asoc/topic/fsl' into asoc-nextMark Brown
2013-06-17Merge remote-tracking branch 'asoc/topic/fsi' into asoc-nextMark Brown
2013-06-17Merge remote-tracking branch 'asoc/topic/ep93xx' into asoc-nextMark Brown
2013-06-17Merge remote-tracking branch 'asoc/topic/dwc' into asoc-nextMark Brown
2013-06-17Merge remote-tracking branch 'asoc/topic/dfmbcs320' into asoc-nextMark Brown
2013-06-17Merge remote-tracking branch 'asoc/topic/davinci' into asoc-nextMark Brown
2013-06-17Merge remote-tracking branch 'asoc/topic/dapm' into asoc-nextMark Brown
2013-06-17Merge remote-tracking branch 'asoc/topic/core' into asoc-nextMark Brown
2013-06-17Merge remote-tracking branch 'asoc/topic/blackfin' into asoc-nextMark Brown
2013-06-17Merge remote-tracking branch 'asoc/topic/atmel' into asoc-nextMark Brown
2013-06-17Merge remote-tracking branch 'asoc/topic/arizona' into asoc-nextMark Brown
2013-06-17Merge remote-tracking branch 'asoc/topic/adsp' into asoc-nextMark Brown
2013-06-17Merge remote-tracking branch 'asoc/topic/adau1701' into asoc-nextMark Brown
2013-06-17Merge remote-tracking branch 'asoc/topic/88pm860x' into asoc-nextMark Brown
2013-06-17Merge remote-tracking branch 'asoc/fix/wm8962' into asoc-linusMark Brown
2013-06-17Merge remote-tracking branch 'asoc/fix/dapm' into asoc-linusMark Brown
2013-06-17Merge remote-tracking branch 'asoc/fix/adsp' into asoc-linusMark Brown
2013-06-17Merge remote-tracking branch 'asoc/fix/adav80x' into asoc-linusMark Brown
2013-06-17ASoC: spear: Convert to use devm_ioremap_resourceTushar Behera
Commit 75096579c3ac ("lib: devres: Introduce devm_ioremap_resource()") introduced devm_ioremap_resource() and deprecated the use of devm_request_and_ioremap(). devm_request_mem_region is called in devm_ioremap_resource(). Hence that part can also be removed. Since devm_ioremap_resource prints error message on failure, there is no need to print an explicit warning message. Signed-off-by: Tushar Behera <tushar.behera@linaro.org> CC: alsa-devel@alsa-project.org CC: Liam Girdwood <lgirdwood@gmail.com> CC: Mark Brown <broonie@kernel.org> Signed-off-by: Mark Brown <broonie@linaro.org>
2013-06-17ASoC: spear: Normalise module namesMark Brown
Signed-off-by: Mark Brown <broonie@linaro.org>
2013-06-17ASoC: davinci: remove sffsdr machine supportSekhar Nori
sffsdr machine support does not build since at least v2.6.36 (~3 years). There is little hope of it being fixed, so remove the support. Signed-off-by: Sekhar Nori <nsekhar@ti.com> Signed-off-by: Mark Brown <broonie@linaro.org>
2013-06-17ASoC: spear: Remove nonexistant EVM optionsMark Brown
The source wasn't added. Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Mark Brown <broonie@linaro.org>
2013-06-15Linux 3.10-rc6Linus Torvalds
2013-06-15Merge tag 'fixes-for-linus' of ↵Linus Torvalds
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc Pull ARM SoC fixes from Olof Johansson: "These are a little later than I planned on since I got caught up with handling merges for 3.11 most of the week. Another week, another batch of fixes for arm-soc platforms. Again, nothing controversial. A few more than would be ideal, but all are valid fixes. In particular the prima2 panic patch is critical since it fixes a problem where multiplatform kernels panic on all but prima2 hardware." * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: ARM: SAMSUNG: pm: Adjust for pinctrl- and DT-enabled platforms ARM: prima2: fix incorrect panic usage arm: mvebu: armada-xp-{gp,openblocks-ax3-4}: specify PCIe range ARM: Kirkwood: handle mv88f6282 cpu in __kirkwood_variant(). ARM: omap3: clock: fix wrong container_of in clock36xx.c ARM: dts: OMAP5: Fix missing PWM capability to timer nodes ARM: dts: omap4-panda|sdp: Fix mux for twl6030 IRQ pin and msecure line ARM: dts: AM33xx: Fix properties on gpmc node arm: omap2: fix AM33xx hwmod infos for UART2 ARM: OMAP3: Fix iva2_pwrdm settings for 3703
2013-06-15Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds
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-15Merge branch 'merge' of ↵Linus Torvalds
git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc Pull powerpc fixes from Benjamin Herrenschmidt: "So here are 3 fixes still for 3.10. Fixes are simple, bugs are nasty (though not recent regressions, nasty enough) and all targeted at stable" * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: powerpc: Fix missing/delayed calls to irq_work powerpc: Fix emulation of illegal instructions on PowerNV platform powerpc: Fix stack overflow crash in resume_kernel when ftracing
2013-06-15smp.h: Use local_irq_{save,restore}() in !SMP version of on_each_cpu().David Daney
Thanks to commit f91eb62f71b3 ("init: scream bloody murder if interrupts are enabled too early"), "bloody murder" is now being screamed. With a MIPS OCTEON config, we use on_each_cpu() in our irq_chip.irq_bus_sync_unlock() function. This gets called in early as a result of the time_init() call. Because the !SMP version of on_each_cpu() unconditionally enables irqs, we get: WARNING: at init/main.c:560 start_kernel+0x250/0x410() Interrupts were enabled early CPU: 0 PID: 0 Comm: swapper Not tainted 3.10.0-rc5-Cavium-Octeon+ #801 Call Trace: show_stack+0x68/0x80 warn_slowpath_common+0x78/0xb0 warn_slowpath_fmt+0x38/0x48 start_kernel+0x250/0x410 Suggested fix: Do what we already do in the SMP version of on_each_cpu(), and use local_irq_save/local_irq_restore. Because we need a flags variable, make it a static inline to avoid name space issues. [ Change from v1: Convert on_each_cpu to a static inline function, add #include <linux/irqflags.h> to avoid build breakage on some files. on_each_cpu_mask() and on_each_cpu_cond() suffer the same problem as on_each_cpu(), but they are not causing !SMP bugs for me, so I will defer changing them to a less urgent patch. ] Signed-off-by: David Daney <david.daney@cavium.com> Cc: Ralf Baechle <ralf@linux-mips.org> Cc: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2013-06-15Merge branch 'for-linus' of ↵Linus Torvalds
git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs Pull VFS fixes from Al Viro: "Several fixes + obvious cleanup (you've missed a couple of open-coded can_lookup() back then)" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: snd_pcm_link(): fix a leak... use can_lookup() instead of direct checks of ->i_op->lookup move exit_task_namespaces() outside of exit_notify() fput: task_work_add() can fail if the caller has passed exit_task_work() ncpfs: fix rmdir returns Device or resource busy
2013-06-15Merge tag 'for-linus-v3.10-rc6' of git://oss.sgi.com/xfs/xfsLinus Torvalds
Pull xfs fixes from Ben Myers: - Remove noisy warnings about experimental support which spams the logs - Add padding to align directory and attr structures correctly - Set block number on child buffer on a root btree split - Disable verifiers during log recovery for non-CRC filesystems * tag 'for-linus-v3.10-rc6' of git://oss.sgi.com/xfs/xfs: xfs: don't shutdown log recovery on validation errors xfs: ensure btree root split sets blkno correctly xfs: fix implicit padding in directory and attr CRC formats xfs: don't emit v5 superblock warnings on write
2013-06-15Merge tag 'char-misc-3.10-rc5' of ↵Linus Torvalds
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc Pull char / misc fixes from Greg Kroah-Hartman: "Here are some small mei driver fixes for 3.10-rc6 that fix some reported problems" * tag 'char-misc-3.10-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: mei: me: clear interrupts on the resume path mei: nfc: fix nfc device freeing mei: init: Flush scheduled work before resetting the device