#
83048ea7 |
| 11-Feb-2013 |
Takashi Iwai <tiwai@suse.de> |
Merge tag 'asoc-3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next
ASoC: Updates for v3.9
A fairly quiet release for ASoC:
- Support for a wider range of hardware in
Merge tag 'asoc-3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next
ASoC: Updates for v3.9
A fairly quiet release for ASoC:
- Support for a wider range of hardware in the compressed stream code. - The ability to mute capture streams as well as playback streams while inactive. - DT support for AK4642, FSI, Samsung I2S and WM8962. - AC'97 support for Tegra. - New driver for max98090, replacing the stub which was there.
Due to dependencies we've also got support for asynchronous I/O in regmap and DTification of DMA support for Samsung platforms (used only by the I2S driver and SPI) merged here as well.
show more ...
|
#
94c16ea6 |
| 10-Feb-2013 |
Olof Johansson <olof@lixom.net> |
Merge tag 'v3.8-rc6' into next/cleanup
Linux 3.8-rc6
|
Revision tags: v3.8-rc7 |
|
#
6dc1c49d |
| 08-Feb-2013 |
Dave Airlie <airlied@redhat.com> |
Merge branch 'fbcon-locking-fixes' of ssh://people.freedesktop.org/~airlied/linux into drm-next
This pulls in most of Linus tree up to -rc6, this fixes the worst lockdep reported issues and re-enabl
Merge branch 'fbcon-locking-fixes' of ssh://people.freedesktop.org/~airlied/linux into drm-next
This pulls in most of Linus tree up to -rc6, this fixes the worst lockdep reported issues and re-enables fbcon lockdep.
(not the fbcon maintainer) * 'fbcon-locking-fixes' of ssh://people.freedesktop.org/~airlied/linux: (529 commits) Revert "Revert "console: implement lockdep support for console_lock"" fbcon: fix locking harder fb: Yet another band-aid for fixing lockdep mess fb: rework locking to fix lock ordering on takeover
show more ...
|
#
61cfd873 |
| 05-Feb-2013 |
Olof Johansson <olof@lixom.net> |
Merge tag 'omap-for-v3.9/board-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/boards
From Tony Lindgren: Minimal updates to OMAP board-*.c files while convertin
Merge tag 'omap-for-v3.9/board-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/boards
From Tony Lindgren: Minimal updates to OMAP board-*.c files while converting things to device tree based booting.
* tag 'omap-for-v3.9/board-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: OMAP2+: omap2plus_defconfig: enable omap1 rtc RX-51: Register twl4030-madc device RX-51: Add leds lp5523 names from Maemo 5 2.6.28 kernel ARM: OMAP2+: AM33XX: omap2plus_defconfig: Add support for few drivers ARM: OMAP1: nokia770: enable CBUS/Retu ARM: OMAP2+: omap2plus_defconfig: enable CMA allocator ARM: OMAP2+: omap2plus_defconfig: enable TFP410 chip support ARM: OMAP3: igep0020: simplify GPIO LEDs dependencies ARM: OMAP2+: craneboard: support the TPS65910 PMU ARM: OMAP2+: craneboard: support NAND device ARM: OMAP3: cm-t3517: add MMC support ARM: OMAP2+: Remove apollon board support + Linux 3.8-rc6
Signed-off-by: Olof Johansson <olof@lixom.net>
show more ...
|
#
c1226ff9 |
| 05-Feb-2013 |
Olof Johansson <olof@lixom.net> |
Merge tag 'omap-for-v3.9/fixes-non-critical-signed-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/fixes-non-critical
From Tony Lindgren: Few fixes for v3.9 merge wi
Merge tag 'omap-for-v3.9/fixes-non-critical-signed-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/fixes-non-critical
From Tony Lindgren: Few fixes for v3.9 merge window that are not urgent for the -rc series.
* tag 'omap-for-v3.9/fixes-non-critical-signed-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: OMAP2+: using strlcpy instead of strncpy ARM: OMAP2+: Fix selection of clockevent timer when using device-tree ARM: OMAP: Fix the use of uninitialized dma_lch_count ARM: OMAP: make wakeupgen_lock raw + Linux 3.8-rc6
show more ...
|
#
4d9e01da |
| 05-Feb-2013 |
David S. Miller <davem@davemloft.net> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next
Jeff Kirsher says:
==================== This series contains updates to e1000e and ixgbe. Majority of the p
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next
Jeff Kirsher says:
==================== This series contains updates to e1000e and ixgbe. Majority of the patches are against e1000e, where Bruce makes several cosmetic #define moves into header files. In addition, Bruce does a cleanup of braces to resolve checkpatch warnings (when using the strict option).
Ixgbe patches contain several fixes as well as updating the copyright. The fixes from Josh Hay, resolved a possible NULL pointer dereference and resolved Smatch warnings by fixing return values and memcpy parameters. Alex provides 2 fixes, the first is to replace rmb() with read_barrier_depends() in the Tx cleanup. The second fixes an MTU warning when using SR-IOV which corrects the fact that we were using 1522 to test for the max frame size in ixgbe_change_mtu and 1518 in ixgbe_set_vf_lpe. The difference was the addition of VLAN_HLEN, which we only need to add in the case of computing a buffer size, but not a filter size. Lastly, a patch from Emil which is based on a community patch from Aurélien Guillaume which adds functions needed for reading SFF-8472 diagnostic data from SFP modules. ====================
Signed-off-by: David S. Miller <davem@davemloft.net>
show more ...
|
Revision tags: v3.8-rc6, v3.8-rc5, v3.8-rc4, v3.8-rc3 |
|
#
434c5e39 |
| 08-Jan-2013 |
Don Skidmore <donald.c.skidmore@intel.com> |
ixgbe: update date to 2013
Signed-off-by: Don Skidmore <donald.c.skidmore@intel.com> Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
|
#
604d11d9 |
| 05-Feb-2013 |
Olof Johansson <olof@lixom.net> |
Merge tag 'v3.8-rc6' into next/dt
Linux 3.8-rc6
|
#
469da620 |
| 05-Feb-2013 |
Olof Johansson <olof@lixom.net> |
Merge tag 'v3.8-rc6' into next/soc
Linux 3.8-rc6
|
#
2fb20e2e |
| 04-Feb-2013 |
Russell King <rmk+kernel@arm.linux.org.uk> |
Merge branch 'for-rmk/broadcast' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into devel-stable
|
#
d954896e |
| 01-Feb-2013 |
Will Deacon <will.deacon@arm.com> |
Merge branch 'timers/for-arm' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into for-rmk/broadcast
|
#
b5831174 |
| 01-Feb-2013 |
H. Peter Anvin <hpa@linux.intel.com> |
Merge tag 'v3.8-rc6' into x86/urgent
Linux 3.8-rc6
Merged in order to add a documentation update versus new code in upstream.
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
|
#
a9037430 |
| 31-Jan-2013 |
Thomas Gleixner <tglx@linutronix.de> |
Merge branch 'timers/for-arm' into timers/core
|
#
de65d816 |
| 29-Jan-2013 |
H. Peter Anvin <hpa@linux.intel.com> |
Merge remote-tracking branch 'origin/x86/boot' into x86/mm2
Coming patches to x86/mm2 require the changes and advanced baseline in x86/boot.
Resolved Conflicts: arch/x86/kernel/setup.c mm/nobootm
Merge remote-tracking branch 'origin/x86/boot' into x86/mm2
Coming patches to x86/mm2 require the changes and advanced baseline in x86/boot.
Resolved Conflicts: arch/x86/kernel/setup.c mm/nobootmem.c
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
show more ...
|
#
61767729 |
| 29-Jan-2013 |
Jiri Kosina <jkosina@suse.cz> |
Merge branch 'master' into for-next
Conflicts: drivers/devfreq/exynos4_bus.c
Sync with Linus' tree to be able to apply patches that are against newer code (mvneta).
|
#
dfd0436a |
| 29-Jan-2013 |
Benjamin Herrenschmidt <benh@kernel.crashing.org> |
Merge branch 'merge' into next
Merge "merge" branch to bring in various bug fixes that are going into 3.8
|
#
22f83798 |
| 28-Jan-2013 |
Linus Torvalds <torvalds@linux-foundation.org> |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Pull networking updates from David Miller: "Much more accumulated than I would have liked due to an unexpected bout with a nasty flu:
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Pull networking updates from David Miller: "Much more accumulated than I would have liked due to an unexpected bout with a nasty flu:
1) AH and ESP input don't set ECN field correctly because the transport head of the SKB isn't set correctly, fix from Li RongQing.
2) If netfilter conntrack zones are disabled, we can return an uninitialized variable instead of the proper error code. Fix from Borislav Petkov.
3) Fix double SKB free in ath9k driver beacon handling, from Felix Feitkau.
4) Remove bogus assumption about netns cleanup ordering in nf_conntrack, from Pablo Neira Ayuso.
5) Remove a bogus BUG_ON in the new TCP fastopen code, from Eric Dumazet. It uses spin_is_locked() in it's test and is therefore unsuitable for UP.
6) Fix SELINUX labelling regressions added by the tuntap multiqueue changes, from Paul Moore.
7) Fix CRC errors with jumbo frame receive in tg3 driver, from Nithin Nayak Sujir.
8) CXGB4 driver sets interrupt coalescing parameters only on first queue, rather than all of them. Fix from Thadeu Lima de Souza Cascardo.
9) Fix regression in the dispatch of read/write registers in dm9601 driver, from Tushar Behera.
10) ipv6_append_data miscalculates header length, from Romain KUNTZ.
11) Fix PMTU handling regressions on ipv4 routes, from Steffen Klassert, Timo Teräs, and Julian Anastasov.
12) In 3c574_cs driver, add necessary parenthesis to "x << y & z" expression. From Nickolai Zeldovich.
13) macvlan_get_size() causes underallocation netlink message space, fix from Eric Dumazet.
14) Avoid division by zero in xfrm_replay_advance_bmp(), from Nickolai Zeldovich. Amusingly the zero check was already there, we were just performing it after the modulus :-)
15) Some more splice bug fixes from Eric Dumazet, which fix things mostly eminating from how we now more aggressively use high-order pages in SKBs.
16) Fix size calculation bug when freeing hash tables in the IPSEC xfrm code, from Michal Kubecek.
17) Fix PMTU event propagation into socket cached routes, from Steffen Klassert.
18) Fix off by one in TX buffer release in netxen driver, from Eric Dumazet.
19) Fix rediculous memory allocation requirements introduced by the tuntap multiqueue changes, from Jason Wang.
20) Remove bogus AMD platform workaround in r8169 driver that causes major problems in normal operation, from Timo Teräs.
21) virtio-net set affinity and select queue don't handle discontiguous cpu numbers properly, fix from Wanlong Gao.
22) Fix a route refcounting issue in loopback driver, from Eric Dumazet. There's a similar fix coming that we might add to the macvlan driver as well.
23) Fix SKB leaks in batman-adv's distributed arp table code, from Matthias Schiffer.
24) r8169 driver gives descriptor ownership back the hardware before we're done reading the VLAN tag out of it, fix from Francois Romieu.
25) Checksums not calculated properly in GRE tunnel driver fix from Pravin B Shelar.
26) Fix SCTP memory leak on namespace exit."
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (101 commits) dm9601: support dm9620 variant SCTP: Free the per-net sysctl table on net exit. v2 net: phy: icplus: fix broken INTR pin settings net: phy: icplus: Use the RGMII interface mode to configure clock delays IP_GRE: Fix kernel panic in IP_GRE with GRE csum. sctp: set association state to established in dupcook_a handler ip6mr: limit IPv6 MRT_TABLE identifiers r8169: fix vlan tag read ordering. net: cdc_ncm: use IAD provided by the USB core batman-adv: filter ARP packets with invalid MAC addresses in DAT batman-adv: check for more types of invalid IP addresses in DAT batman-adv: fix skb leak in batadv_dat_snoop_incoming_arp_reply() net: loopback: fix a dst refcounting issue virtio-net: reset virtqueue affinity when doing cpu hotplug virtio-net: split out clean affinity function virtio-net: fix the set affinity bug when CPU IDs are not consecutive can: pch_can: fix invalid error codes can: ti_hecc: fix invalid error codes can: c_can: fix invalid error codes r8169: remove the obsolete and incorrect AMD workaround ...
show more ...
|
#
031554ea |
| 27-Jan-2013 |
David S. Miller <davem@davemloft.net> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next
Signed-off-by: David S. Miller <davem@davemloft.net>
|
#
7b5c4a65 |
| 26-Jan-2013 |
H. Peter Anvin <hpa@linux.intel.com> |
Merge tag 'v3.8-rc5' into x86/mm
The __pa() fixup series that follows touches KVM code that is not present in the existing branch based on v3.7-rc5, so merge in the current upstream from Linus.
Sig
Merge tag 'v3.8-rc5' into x86/mm
The __pa() fixup series that follows touches KVM code that is not present in the existing branch based on v3.7-rc5, so merge in the current upstream from Linus.
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
show more ...
|
#
befddb21 |
| 24-Jan-2013 |
Ingo Molnar <mingo@kernel.org> |
Merge tag 'v3.8-rc4' into irq/core
Merge Linux 3.8-rc4 before pulling in new commits - we were on an old v3.7 base.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
|
Revision tags: v3.8-rc2, v3.8-rc1, v3.7 |
|
#
b205c0de |
| 08-Dec-2012 |
Jacob Keller <jacob.e.keller@intel.com> |
ixgbe: only compile ixgbe_debugfs.o when enabled
This patch modifies ixgbe_debugfs.c and the Makefile for the ixgbe driver to only compile the file when the config is enabled. This means we can remo
ixgbe: only compile ixgbe_debugfs.o when enabled
This patch modifies ixgbe_debugfs.c and the Makefile for the ixgbe driver to only compile the file when the config is enabled. This means we can remove the #ifdef inside the ixgbe_debugfs.c file.
Signed-off-by: Jacob Keller <jacob.e.keller@intel.com> Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
show more ...
|
#
86833f0a |
| 08-Dec-2012 |
Jacob Keller <jacob.e.keller@intel.com> |
ixgbe: only compile ixgbe_debugfs.o when enabled
This patch modifies ixgbe_debugfs.c and the Makefile for the ixgbe driver to only compile the file when the config is enabled. This means we can remo
ixgbe: only compile ixgbe_debugfs.o when enabled
This patch modifies ixgbe_debugfs.c and the Makefile for the ixgbe driver to only compile the file when the config is enabled. This means we can remove the #ifdef inside the ixgbe_debugfs.c file.
Signed-off-by: Jacob Keller <jacob.e.keller@intel.com> Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
show more ...
|
#
734d1ece |
| 11-Jan-2013 |
Mauro Carvalho Chehab <mchehab@redhat.com> |
Merge tag 'v3.8-rc3' into v4l_for_linus
Linux 3.8-rc3
* tag 'v3.8-rc3': (11110 commits) Linux 3.8-rc3 mm: reinstante dropped pmd_trans_splitting() check cred: Remove tgcred pointer from struc
Merge tag 'v3.8-rc3' into v4l_for_linus
Linux 3.8-rc3
* tag 'v3.8-rc3': (11110 commits) Linux 3.8-rc3 mm: reinstante dropped pmd_trans_splitting() check cred: Remove tgcred pointer from struct cred drm/ttm: fix fence locking in ttm_buffer_object_transfer ARM: clps711x: Fix bad merge of clockevents setup ARM: highbank: save and restore L2 cache and GIC on suspend ARM: highbank: add a power request clear ARM: highbank: fix secondary boot and hotplug ARM: highbank: fix typos with hignbank in power request functions ARM: dts: fix highbank cpu mpidr values ARM: dts: add device_type prop to cpu nodes on Calxeda platforms drm/prime: drop reference on imported dma-buf come from gem xen/netfront: improve truesize tracking ARM: mx5: Fix MX53 flexcan2 clock ARM: OMAP2+: am33xx-hwmod: Fix wrongly terminated am33xx_usbss_mpu_irqs array sctp: fix Kconfig bug in default cookie hmac selection EDAC: Cleanup device deregistering path EDAC: Fix EDAC Kconfig menu EDAC: Fix kernel panic on module unloading ALSA: hda - add mute LED for HP Pavilion 17 (Realtek codec) ...
show more ...
|
#
cf9ce948 |
| 07-Jan-2013 |
James Morris <james.l.morris@oracle.com> |
Merge tag 'v3.8-rc2' into next
Sync to Linus' tree.
Linux 3.8-rc2
|
#
a44dca17 |
| 27-Dec-2012 |
Mauro Carvalho Chehab <mchehab@redhat.com> |
Merge tag 'v3.8-rc1' into staging/for_v3.9
Linux 3.8-rc1
* tag 'v3.8-rc1': (10696 commits) Linux 3.8-rc1 Revert "nfsd: warn on odd reply state in nfsd_vfs_read" ARM: dts: fix duplicated build
Merge tag 'v3.8-rc1' into staging/for_v3.9
Linux 3.8-rc1
* tag 'v3.8-rc1': (10696 commits) Linux 3.8-rc1 Revert "nfsd: warn on odd reply state in nfsd_vfs_read" ARM: dts: fix duplicated build target and alphabetical sort out for exynos dm stripe: add WRITE SAME support dm: remove map_info dm snapshot: do not use map_context dm thin: dont use map_context dm raid1: dont use map_context dm flakey: dont use map_context dm raid1: rename read_record to bio_record dm: move target request nr to dm_target_io dm snapshot: use per_bio_data dm verity: use per_bio_data dm raid1: use per_bio_data dm: introduce per_bio_data dm kcopyd: add WRITE SAME support to dm_kcopyd_zero dm linear: add WRITE SAME support dm: add WRITE SAME support dm: prepare to support WRITE SAME dm ioctl: use kmalloc if possible ...
Conflicts: MAINTAINERS
show more ...
|