aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2013-10-08ALSA: hda - Add fixup for ASUS N56VZTakashi Iwai1-0/+1
ASUS N56VZ needs a fixup for the bass speaker pin, which was already provided via model=asus-mode4. Bugzilla: https://bugzilla.novell.com/show_bug.cgi?id=841645 Cc: <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2013-10-08ARM: mach-omap2: board-generic: fix undefined symbolSimon Barth1-2/+2
Since dra7 reuses the function 'omap5_realtime_timer_init' in arch/arm/mach-omap2/board-generic.c as timer init function, it has to be built for this SoC as well. Signed-off-by: Simon Barth <[email protected]> Signed-off-by: Tony Lindgren <[email protected]>
2013-10-08ARM: dts: Fix pinctrl mask for omap3Tony Lindgren3-8/+4
The wake-up interrupt bit is available on omap3/4/5 processors unlike what we claim. Without fixing it we cannot use it on omap3 and the system configured for wake-up events will just hang on wake-up. Cc: Grygorii Strashko <[email protected]> Cc: Benoît Cousson <[email protected]> Cc: [email protected] Signed-off-by: Tony Lindgren <[email protected]>
2013-10-08ARM: OMAP3: Fix hardware detection for omap3630 when booted with device treeNishanth Menon2-1/+19
SoC family definitions at the moment are reactive to board needs as a result, beagle-xm would matchup with ti,omap3 which invokes omap3430_init_early instead of omap3630_init_early. Obviously, this is the wrong behavior. With clock node dts conversion, we get the following warnings before system hangs as a result and 3630 based platforms fails to boot (uart4 clocks are only present in OMAP3630 and not present in OMAP3430): ... omap_hwmod: uart4: cannot clk_get main_clk uart4_fck omap_hwmod: uart4: cannot _init_clocks WARNING: CPU: 0 PID: 1 at arch/arm/mach-omap2/omap_hwmod.c:2434 _init+0x6c/0x80() omap_hwmod: uart4: couldn't init clocks ... WARNING: CPU: 0 PID: 1 at arch/arm/mach-omap2/omap_hwmod.c:2126 _enable+0x254/0x280() omap_hwmod: timer12: enabled state can only be entered from initialized, idle, or disabled state ... WARNING: CPU: 0 PID: 46 at arch/arm/mach-omap2/omap_hwmod.c:2224 _idle+0xd4/0xf8() omap_hwmod: timer12: idle state can only be entered from enabled state WARNING: CPU: 0 PID: 1 at arch/arm/mach-omap2/omap_hwmod.c:2126 _enable+0x254/0x280() omap_hwmod: uart4: enabled state can only be entered from initialized, idle, or disabled state So, add specific compatiblity for 3630 to allow match for Beagle-XM platform. Signed-off-by: Nishanth Menon <[email protected]> [[email protected]: left out ti,omap343x, updated comments] Signed-off-by: Tony Lindgren <[email protected]>
2013-10-08Merge branch 'perf-urgent-for-linus' of ↵Linus Torvalds11-35/+106
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip Pull perf fixes from Ingo Molnar: "Various fixlets: On the kernel side: - fix a race - fix a bug in the handling of the perf ring-buffer data page On the tooling side: - fix the handling of certain corrupted perf.data files - fix a bug in 'perf probe' - fix a bug in 'perf record + perf sched' - fix a bug in 'make install' - fix a bug in libaudit feature-detection on certain distros" * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: perf session: Fix infinite loop on invalid perf.data file perf tools: Fix installation of libexec components perf probe: Fix to find line information for probe list perf tools: Fix libaudit test perf stat: Set child_pid after perf_evlist__prepare_workload() perf tools: Add default handler for mmap2 events perf/x86: Clean up cap_user_time* setting perf: Fix perf_pmu_migrate_context
2013-10-08ARM: dts: OMAP5: add palmas-usb nodeFelipe Balbi2-1/+13
Without this node, there will be no palmas driver to notify dwc3 that a cable has been connected and, without that, dwc3 will never initialize. Signed-off-by: Felipe Balbi <[email protected]> [[email protected]: added dt properties for enabling vbus/id interrupts and fixed vbus-supply value after SMPS10 is modeled as 2 regulators] Signed-off-by: Kishon Vijay Abraham I <[email protected]> Signed-off-by: Benoit Cousson <[email protected]>
2013-10-08ARM: dts: omap3-beagle: Make USB host pin naming consistentRoger Quadros1-12/+12
Use a common naming scheme "mode0name.modename flags" for the USB host pins to be consistent. Signed-off-by: Roger Quadros <[email protected]> Signed-off-by: Benoit Cousson <[email protected]>
2013-10-08ARM: dts: Add devicetree for gta04 board.Marek Belisko2-0/+169
This adds devicetree for gta04 (Openmoko next generation board) with necessary support for mmc, usb, leds and button. Signed-off-by: Marek Belisko <[email protected]> Signed-off-by: Benoit Cousson <[email protected]>
2013-10-08ARM: dts: AM4372: add few nodesAfzal Mohammed1-0/+343
Populate uarts, timers, rtc, wdt, gpio, i2c, spi, cpsw & pwm nodes. Reason for adding these nodes early - hwmod code required address space of peripherals corresponding to these nodes (as address space details are removed from hwmod database). uart0, timers - 1 & 2 and synctimer were already present, so here the remaining uarts & timers are added. All properties as per the existing binding has been added for uart, timer, rtc, wdt & gpio. Even though that was not the current scope of work, felt adding those would reduce or require no effort later to get these peripherals working. For i2c, spi, cpsw & pwm - only the properties that were sure to be correct has been added (main intention is to make hwmod happy and avoid any later modification to here added properties). While at it add "ti,hwmod" property to already existing nodes. Signed-off-by: Afzal Mohammed <[email protected]> Signed-off-by: Benoit Cousson <[email protected]>
2013-10-08ARM: dts: AM4372: cpu(s) node per latest bindingAfzal Mohammed1-0/+4
Update AM4372 cpu node to the latest cpus/cpu bindings for ARM. Signed-off-by: Afzal Mohammed <[email protected]> Acked-by: Mark Rutland <[email protected]> Signed-off-by: Benoit Cousson <[email protected]>
2013-10-08ARM: dts: DRA7: Add the dts files for dra7 SoC and dra7-evm boardR Sricharan4-1/+767
Add minimal device tree source needed for DRA7 based SoCs. Also add a board dts file for the dra7-evm (based on dra752) which contains 1.5G of memory with 1G interleaved and 512MB non-interleaved. Also added in the board file are pin configuration details for i2c, mcspi and uart devices on board. Signed-off-by: R Sricharan <[email protected]> Signed-off-by: Rajendra Nayak <[email protected]> Signed-off-by: Sourav Poddar <[email protected]> Signed-off-by: Benoit Cousson <[email protected]>
2013-10-08ARM: dts: twl6030: Move common configuration for OMAP4 boards in a separate ↵Ruslan Bilovol3-40/+40
dtsi file The OMAP4 SoC family uses specially-designed PMIC (power management IC) companion chip for power management needs: TWL6030/TWL6032. Therefore there is a typical connection of PMIC to OMAP4 so we can move it into separate .dtsi file and do not duplicate over board-specific files. Tested on OMAP4 SDP board and Pandaboard ES2. Signed-off-by: Ruslan Bilovol <[email protected]> Signed-off-by: Benoit Cousson <[email protected]>
2013-10-08ARM: dts: Remove '0x's from OMAP5 DTS fileLee Jones1-2/+2
Cc: Tony Lindgren <[email protected]> Signed-off-by: Lee Jones <[email protected]> Signed-off-by: Benoit Cousson <[email protected]>
2013-10-08ARM: dts: Remove '0x's from OMAP4 DTS fileLee Jones1-1/+1
Cc: Tony Lindgren <[email protected]> Signed-off-by: Lee Jones <[email protected]> Signed-off-by: Benoit Cousson <[email protected]>
2013-10-08ARM: dts: Remove '0x's from OMAP3430 SDP DTS fileLee Jones1-11/+11
Cc: Tony Lindgren <[email protected]> Signed-off-by: Lee Jones <[email protected]> Signed-off-by: Benoit Cousson <[email protected]>
2013-10-08ARM: dts: Remove '0x's from OMAP3 DTS fileLee Jones1-1/+1
Cc: Tony Lindgren <[email protected]> Signed-off-by: Lee Jones <[email protected]> Signed-off-by: Benoit Cousson <[email protected]>
2013-10-08ARM: dts: Remove '0x's from OMAP3 IGEP0030 DTS fileLee Jones1-4/+4
Cc: Tony Lindgren <[email protected]> Signed-off-by: Lee Jones <[email protected]> Signed-off-by: Benoit Cousson <[email protected]>
2013-10-08ARM: dts: Remove '0x's from OMAP3 IGEP0020 DTS fileLee Jones1-4/+4
Cc: Tony Lindgren <[email protected]> Signed-off-by: Lee Jones <[email protected]> Signed-off-by: Benoit Cousson <[email protected]>
2013-10-08ARM: dts: Remove '0x's from OMAP2420 H4 DTS fileLee Jones1-3/+3
Cc: Tony Lindgren <[email protected]> Signed-off-by: Lee Jones <[email protected]> Signed-off-by: Benoit Cousson <[email protected]>
2013-10-08ARM: dts: omap5-uevm: Split SMPS10 in two nodesKishon Vijay Abraham I1-2/+11
SMPS10 has two outputs OUT1 and OUT2. Hence SMPS10 is modeled as two regulators. The DT node is split to reflect it. Signed-off-by: Kishon Vijay Abraham I <[email protected]> Signed-off-by: Benoit Cousson <[email protected]>
2013-10-08ARM: dts: AM33xx: Correct gpio #interrupt-cells propertyLars Poeschel1-4/+4
Following commit ff5c9059 and therefore other omap platforms using the gpio-omap driver correct the #interrupt-cells property on am33xx too. The omap gpio binding documentaion also states that the #interrupt-cells property should be 2. Signed-off-by: Lars Poeschel <[email protected]> Reviewed-by: Javier Martinez Canillas <[email protected]> Acked-by: Mark Rutland <[email protected]> Signed-off-by: Benoit Cousson <[email protected]>
2013-10-08ARM: dts: AM33XX: Add PMU supportAlexandre Belloni1-0/+5
ARM Performance Monitor Units are available on the am33xx, add the support in the dtsi. Tested with perf and oprofile on a regular beaglebone. Signed-off-by: Alexandre Belloni <[email protected]> Signed-off-by: Benoit Cousson <[email protected]>
2013-10-08ARM: dts: omap3-igep0030: add mux conf for GPIO LEDJavier Martinez Canillas1-0/+9
The IGEP COM MOdule has a GPIO LED connected to OMAP pins. Configure this pin as output GPIO. Signed-off-by: Javier Martinez Canillas <[email protected]> Tested-by: Enric Balletbo i Serra <[email protected]> Signed-off-by: Benoit Cousson <[email protected]>
2013-10-08ARM: dts: omap3-igep0020: add mux conf for GPIO LEDsJavier Martinez Canillas1-0/+11
The IGEPv2 has a number of GPIO LED connected to OMAP pins. Configure these pins as output GPIO. Signed-off-by: Javier Martinez Canillas <[email protected]> Tested-by: Enric Balletbo i Serra <[email protected]> Signed-off-by: Benoit Cousson <[email protected]>
2013-10-08ARM: dts: omap3-igep: add pinmux node for GPIO LED configurationJavier Martinez Canillas1-0/+2
IGEP boards have a number of LED connected to OMAP or TWL GPIO lines. The actual wiring is different on each board so each board DT has need to configure the mux correctly. Even though it works with the current DT, the kernel complains with: [2.305023] leds-gpio leds.18: pins are not configured from the driver Add an empty pinmux_leds_pins pinctrl child node so boards can override with the correct mux configuration and not depend on default values for the GPIO LEDs to work. Signed-off-by: Javier Martinez Canillas <[email protected]> Signed-off-by: Benoit Cousson <[email protected]>
2013-10-08ARM: dts: N900: Add device treePavel Machek2-0/+93
This adds device tree with necessary support to boot with functional video (on both emulator and real N900 device). Signed-off-by: Pavel Machek <[email protected]> Signed-off-by: Aaro Koskinen <[email protected]> Signed-off-by: Benoit Cousson <[email protected]>
2013-10-08ALSA: hda - hdmi: Fix channel map switch not taking effectAnssi Hannula1-10/+8
Currently hdmi_setup_audio_infoframe() reprograms the HDA channel mapping only when the infoframe is not up-to-date or the non-PCM flag has changed. However, when just the channel map has been changed, the infoframe may still be up-to-date and non-PCM flag may not have changed, so the new channel map is not actually programmed into the HDA codec. Notably, this failing case is also always triggered when the device is already in a prepared state and a new channel map is configured while changing only the channel positions (for example, plain "speaker-test -c2 -m FR,FL"). Fix that by always programming the channel map in hdmi_setup_audio_infoframe(). Tested on Intel HDMI. Signed-off-by: Anssi Hannula <[email protected]> Cc: <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2013-10-08drm/nouveau/mc: disable msi support by default, it's busted in tons of placesBen Skeggs1-1/+1
Signed-off-by: Ben Skeggs <[email protected]>
2013-10-08Merge tag 'perf-urgent-for-mingo' of ↵Ingo Molnar8-23/+77
git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent Pull perf/urgent fixes from Arnaldo Carvalho de Melo: * The libaudit test was failing in some systems due to a unescaped newline, fix it so that the 'trace' tool can be built in such systems. * Fix installation of libexec components. * Add default handler for mmap2 events so that tools that don't explicitely define an MMAP2 handler don't crash, fix from David Ahern. * Fix to find line information for probe list, from Masami Hiramatsu. * Set child_pid after perf_evlist__prepare_workload(), fix from Namhyung Kim. * Fix infinite loop on invalid perf.data file, from Namhyung Kim. Signed-off-by: Arnaldo Carvalho de Melo <[email protected]> Signed-off-by: Ingo Molnar <[email protected]>
2013-10-07powerpc/irq: Don't switch to irq stack from softirq stackBenjamin Herrenschmidt1-2/+3
irq_exit() is now called on the irq stack, which can trigger a switch to the softirq stack from the irq stack. If an interrupt happens at that point, we will not properly detect the re-entrancy and clobber the original return context on the irq stack. This fixes it. The side effect is to prevent all nesting from softirq stack to irq stack even in the "safe" case but it's simpler that way and matches what x86_64 does. Reported-by: Cédric Le Goater <[email protected]> Tested-by: Cédric Le Goater <[email protected]> Signed-off-by: Benjamin Herrenschmidt <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2013-10-07Merge branch 'for-linus' of ↵Linus Torvalds13-27/+63
git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid Pull HID fixes from Jiri Kosina: - fix for hidraw reference counting regression, by Manoj Chourasia - fix for minor number allocation for uhid, by David Herrmann - other small unsorted fixes / device ID additions * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: HID: wiimote: fix FF deadlock HID: add Holtek USB ID 04d9:a081 SHARKOON DarkGlider HID: hidraw: close underlying device at removal of last reader HID: roccat: Fix "cannot create duplicate filename" problems HID: uhid: allocate static minor
2013-10-07Merge branch 'stable' of ↵Linus Torvalds9-42/+84
git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile Pull Tile bugfixes from Chris Metcalf: "This fixes some serious issues with PREEMPT support, and a couple of smaller corner-case issues fixed in the last couple of weeks" * 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile: arch: tile: re-use kbasename() helper tile: use a more conservative __my_cpu_offset in CONFIG_PREEMPT tile: ensure interrupts disabled for preempt_schedule_irq() tile: change lock initalization in hardwall tile: include: asm: use 'long long' instead of 'u64' for atomic64_t and its related functions
2013-10-07HID: wiimote: fix FF deadlockDavid Herrmann2-12/+32
The input core has an internal spinlock that is acquired during event injection via input_event() and friends but also held during FF callbacks. That means, there is no way to share a lock between event-injection and FF handling. Unfortunately, this is what is required for wiimote state tracking and what we do with state.lock and input->lock. This deadlock can be triggered when using continuous data reporting and FF on a wiimote device at the same time. I takes me at least 30m of stress-testing to trigger it but users reported considerably shorter times (http://bpaste.net/show/132504/) when using some gaming-console emulators. The real problem is that we have two copies of internal state, one in the wiimote objects and the other in the input device. As the input-lock is not supposed to be accessed from outside of input-core, we have no other chance than offloading FF handling into a worker. This actually works pretty nice and also allows to implictly merge fast rumble changes into a single request. Due to the 3-layered workers (rumble+queue+l2cap) this might reduce FF responsiveness. Initial tests were fine so lets fix the race first and if it turns out to be too slow we can always handle FF out-of-band and skip the queue-worker. Cc: <[email protected]> # 3.11+ Reported-by: Thomas Schneider Signed-off-by: David Herrmann <[email protected]> Signed-off-by: Jiri Kosina <[email protected]>
2013-10-07Merge remote-tracking branch 'spi/fix/s3c64xx' into spi-linusMark Brown1-2/+2
2013-10-07Merge remote-tracking branch 'spi/fix/pxa' into spi-linusMark Brown1-1/+10
2013-10-07Merge remote-tracking branch 'spi/fix/mpc512x' into spi-linusMark Brown1-1/+3
2013-10-07Merge remote-tracking branch 'spi/fix/hspi' into spi-linusMark Brown1-2/+2
2013-10-07Merge remote-tracking branch 'spi/fix/dspi' into spi-linusMark Brown1-8/+2
2013-10-07Merge remote-tracking branch 'spi/fix/clps711x' into spi-linusMark Brown1-3/+0
2013-10-07MIPS: stack protector: Fix per-task canary switchJames Hogan3-3/+3
Commit 1400eb6 (MIPS: r4k,octeon,r2300: stack protector: change canary per task) was merged in v3.11 and introduced assembly in the MIPS resume functions to update the value of the current canary in __stack_chk_guard. However it used PTR_L resulting in a load of the canary value, instead of PTR_LA to construct its address. The value is intended to be random but is then treated as an address in the subsequent LONG_S (store). This was observed to cause a fault and panic: CPU 0 Unable to handle kernel paging request at virtual address 139fea20, epc == 8000cc0c, ra == 8034f2a4 Oops[#1]: ... $24 : 139fea20 1e1f7cb6 ... Call Trace: [<8000cc0c>] resume+0xac/0x118 [<8034f2a4>] __schedule+0x5f8/0x78c [<8034f4e0>] schedule_preempt_disabled+0x20/0x2c [<80348eec>] rest_init+0x74/0x84 [<804dc990>] start_kernel+0x43c/0x454 Code: 3c18804b 8f184030 8cb901f8 <af190000> 00c0e021 8cb002f0 8cb102f4 8cb202f8 8cb302fc This can also be forced by modifying arch/mips/include/asm/stackprotector.h so that the default __stack_chk_guard value is more likely to be a bad (or unaligned) pointer. Fix it to use PTR_LA instead, to load the address of the canary value, which the LONG_S can then use to write into it. Reported-by: bobjones (via #mipslinux on IRC) Signed-off-by: James Hogan <[email protected]> Cc: Ralf Baechle <[email protected]> Cc: Gregory Fong <[email protected]> Cc: [email protected] Cc: [email protected] Patchwork: https://patchwork.linux-mips.org/patch/6026/ Signed-off-by: Ralf Baechle <[email protected]>
2013-10-07spi: atmel: Fix incorrect error pathSachin Kamat1-1/+2
'irq' was not released when clk_prepare_enable failed. Fix it. Signed-off-by: Sachin Kamat <[email protected]> Acked-by: Nicolas Ferre <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2013-10-07ALSA: hda - Fix mono speakers and headset mic on Dell Vostro 5470David Henningsson1-0/+27
On this machine, DAC on node 0x03 seems to give mono output. Also, it needs additional patches for headset mic support. It supports CTIA style headsets only. Alsa-info available at the bug link below. Cc: [email protected] (v3.10+) BugLink: https://bugs.launchpad.net/bugs/1236228 Signed-off-by: David Henningsson <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2013-10-07Merge branch 'for-linus' of ↵Linus Torvalds6-27/+33
git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux Pull s390 fixes from Martin Schwidefsky: "A couple of bux fixes, notable are the regression with ptrace vs restarting system calls and the patch for kdump to be able to copy from virtual memory" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: s390: fix system call restart after inferior call s390: Allow vmalloc target buffers for copy_from_oldmem() s390/sclp: properly detect line mode console s390/kprobes: add exrl to list of prohibited opcodes s390/3270: fix return value check in tty3270_resize_work()
2013-10-07Merge tag 'drm-intel-fixes-2013-10-07' of ↵Dave Airlie4-9/+16
git://people.freedesktop.org/~danvet/drm-intel into drm-fixes Daniel writes: Just a few important fixes, all cc: stable (I've checked this time around and made sure they're really there ...). The dpms one is a regression from the modeset rework and has a good chance to rectify Linus' hdmi issues. * tag 'drm-intel-fixes-2013-10-07' of git://people.freedesktop.org/~danvet/drm-intel: drm/i915: Only apply DPMS to the encoder if enabled drm/i915: Mask LPSP to get PSR working even with Power Well in use by audio. drm/i915/hsw: Disable L3 caching of atomic memory operations. drm/i915: fix rps.vlv_work initialization
2013-10-06Linux 3.12-rc4Linus Torvalds1-1/+1
2013-10-06net: Update the sysctl permissions handler to test effective uid/gidEric W. Biederman1-2/+2
Modify the code to use current_euid(), and in_egroup_p, as in done in fs/proc/proc_sysctl.c:test_perm() Cc: [email protected] Reviewed-by: Eric Sandeen <[email protected]> Reported-by: Eric Sandeen <[email protected]> Signed-off-by: "Eric W. Biederman" <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2013-10-06Merge git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pendingLinus Torvalds8-25/+67
Pull SCSI target fixes from Nicholas Bellinger: "Here are the outstanding target fixes queued up for v3.12-rc4 code. The highlights include: - Make vhost/scsi tag percpu_ida_alloc() use GFP_ATOMIC - Allow sess_cmd_map allocation failure fallback to use vzalloc - Fix COMPARE_AND_WRITE se_cmd->data_length bug with FILEIO backends - Fixes for COMPARE_AND_WRITE callback recursive failure OOPs + non zero scsi_status bug - Make iscsi-target do acknowledgement tag release from RX context - Setup iscsi-target with extra (cmdsn_depth / 2) percpu_ida tags Also included is a iscsi-target patch CC'ed for v3.10+ that avoids legacy wait_for_task=true release during fast-past StatSN acknowledgement, and two other SRP target related patches that address long-standing issues that are CC'ed for v3.3+. Extra thanks to Thomas Glanzmann for his testing feedback with COMPARE_AND_WRITE + EXTENDED_COPY VAAI logic" * git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending: iscsi-target; Allow an extra tag_num / 2 number of percpu_ida tags iscsi-target: Perform release of acknowledged tags from RX context iscsi-target: Only perform wait_for_tasks when performing shutdown target: Fail on non zero scsi_status in compare_and_write_callback target: Fix recursive COMPARE_AND_WRITE callback failure target: Reset data_length for COMPARE_AND_WRITE to NoLB * block_size ib_srpt: always set response for task management target: Fall back to vzalloc upon ->sess_cmd_map kzalloc failure vhost/scsi: Use GFP_ATOMIC with percpu_ida_alloc for obtaining tag ib_srpt: Destroy cm_id before destroying QP. target: Fix xop->dbl assignment in target_xcopy_parse_segdesc_02
2013-10-06Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dmaLinus Torvalds3-17/+17
Pull slave-dmaengine fixes from Vinod Koul: "Here is the slave dmanegine fixes. We have the fix for deadlock issue on imx-dma by Michael and Josh's edma config fix along with author change" * 'fixes' of git://git.infradead.org/users/vkoul/slave-dma: dmaengine: imx-dma: fix callback path in tasklet dmaengine: imx-dma: fix lockdep issue between irqhandler and tasklet dmaengine: imx-dma: fix slow path issue in prep_dma_cyclic dma/Kconfig: Make TI_EDMA select TI_PRIV_EDMA edma: Update author email address
2013-10-06x86/reboot: Add reboot quirk for Dell Latitude E5410Ville Syrjälä1-0/+8
Dell Latitude E5410 needs reboot=pci to actually reboot. Signed-off-by: Ville Syrjälä <[email protected]> Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Ingo Molnar <[email protected]>
2013-10-05Merge branch 'for-linus' of ↵Linus Torvalds6-17/+39
git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs Pull btrfs fixes from Chris Mason: "This is a small collection of fixes, including a regression fix from Liu Bo that solves rare crashes with compression on. I've merged my for-linus up to 3.12-rc3 because the top commit is only meant for 3.12. The rest of the fixes are also available in my master branch on top of my last 3.11 based pull" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: btrfs: Fix crash due to not allocating integrity data for a bioset Btrfs: fix a use-after-free bug in btrfs_dev_replace_finishing Btrfs: eliminate races in worker stopping code Btrfs: fix crash of compressed writes Btrfs: fix transid verify errors when recovering log tree
Powered by cgit, Gruvboxed by Blaster4385.