Linus Torvalds
e6e7fb1ffc
ARM: SoC fixes for 3.12-rc ...
We have a fairly large batch of fixes this time around, mostly just due to
various platforms all having a fix or two more than usual.
Worth pointing out are:
- A fix for EDMA on Davinci/OMAP where channel allocation broke with
the DT conversion. Due to some miscommunication we didn't
understand the impact of the breakage, so we were pushing back on it
for 3.12, but it sounds like it's actually breaking quite a few people
out there.
- A bunch of fixes for Marvell platforms, some straggling fixes for
merge window fallout and some fixes for a couple of the platforms
(Netgear RN102 in particular).
- A fix for a race between multi-cluster power management and cpu hotplug
on Versatile Express.
And a bunch of other smaller fixes that all add up.
We'll be switching over into stricter regressions-only mode from here
on out.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iQIcBAABAgAGBQJSTO8aAAoJEIwa5zzehBx3t/4P/jVzo0/Yvs0GtlD9tyC5uHgc
aDvz7cjP+/w8Is2amSBr+QR/bslT7gYjyBB9cBZluH/v1juohl16jRZMxHOmoV80
f3OfdJ7gXbKRRgrZNw9sBGWEfKrqb/Zr86CMOm51RpLizhHGXv+88DR/Rc63GgTl
P+NBbhyL9DiL3ox7OLM7UlMafovTR0HegeypMkWghBGaIwsgjheNz1xL0/oi+6tW
i74ehXBqoxpuHXm7UzdVD0VcQ+/GCXFo+yC0BrnGoNZG77Etq9CjpNRV3YFVZhCt
qD9RIznRDX2bA1Mcn74bFB9H+eL4c866p/gAH8tgbwdym9KtTcqNgYTR2nL5aAHa
OfD23lsaiy7yftPQX4bnD53bzeXJCJ+246SECK06fphS6PihYPK6iubxVL4yA5e/
iwzqCPQ3+f9NmC4+tLoydA2xzSHtgeCQc+smYVQlyyDMtEUaCzj58GDKebUpm62X
uMIQ8wrDRSJXURZl708UUixEvzQ6OLVgp1B3ASbedbh542qTQIpC2W8FIkYOUb6u
S7uErba0u/UC+bxBlAYNWnBM1npT//bZgCC8LRAJ+S3HIv8OGhHStsCZfGQxbeND
NxgPbHJPgSQu6RzaHcYSweuO38cfl6zkNcor8gf6ts3UOYnJuD+l8PLfqN13Erjm
NUL6gyQIF4uekR4GOTdI
=DLem
-----END PGP SIGNATURE-----
Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC fixes from Olof Johansson:
"We have a fairly large batch of fixes this time around, mostly just
due to various platforms all having a fix or two more than usual.
Worth pointing out are:
- A fix for EDMA on Davinci/OMAP where channel allocation broke with
the DT conversion. Due to some miscommunication we didn't
understand the impact of the breakage, so we were pushing back on
it for 3.12, but it sounds like it's actually breaking quite a few
people out there.
- A bunch of fixes for Marvell platforms, some straggling fixes for
merge window fallout and some fixes for a couple of the platforms
(Netgear RN102 in particular).
- A fix for a race between multi-cluster power management and cpu
hotplug on Versatile Express.
And a bunch of other smaller fixes that all add up.
We'll be switching over into stricter regressions-only mode from here
on out"
* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (31 commits)
ARM: multi_v7_defconfig: add SDHCI for i.MX
bus: mvebu-mbus: Fix optional pcie-mem/io-aperture properties
ARM: mvebu: add missing DT Mbus ranges and relocate PCIe DT nodes for RN102
ARM: at91: sam9g45: shutdown ddr1 too when rebooting
MAINTAINERS: ARM: SIRF: use kernel.org mail box
MAINTAINERS: ARM: SIRF: add missed drivers into maintain list
ARM: edma: Fix clearing of unused list for DT DMA resources
ARM: vexpress: tc2: fix hotplug/idle/kexec race on cluster power down
ARM: dts: sirf: fix interrupt and dma prop of VIP for prima2 and atlas6
ARM: dts: sirf: fix the ranges of peri-iobrg of prima2
ARM: dts: makefile: build atlas6-evb.dtb for ARCH_ATLAS6
ARM: dts: sirf: fix fifosize, clks, dma channels for UART
ARM: mvebu: Add DT entry for ReadyNAS 102 to use gpio-poweroff driver
ARM: mvebu: fix ReadyNAS 102 Power button GPIO to make it active high
ARM: mach-integrator: Add stub for pci_v3_early_init() for !CONFIG_PCI
ARM: shmobile: Remove #gpio-ranges-cells DT property
gpio: rcar: Remove #gpio-range-cells DT property usage
ARM: shmobile: armadillo: fixup ether pinctrl naming
ARM: shmobile: Lager: add Micrel KSZ8041 PHY fixup
ARM: shmobile: update SDHI DT compatibility string to the <unit>-<soc> format
...
2013-10-02 21:48:32 -07:00
- factor out common code from MTD tests
2013-09-09 10:33:19 -07:00
Documentation/accounting/getdelays.c: avoid strncpy in accounting tool
2013-07-03 16:08:06 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2013-09-06 09:36:28 -07:00
aoe: remove do-nothing NAME="%k" term from example udev rules
2013-09-11 15:59:28 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2013-09-06 09:36:28 -07:00
arm64: documentation: tighten up tagged pointer documentation
2013-09-20 09:56:06 +01:00
backlight: lp855x: remove duplicate platform data
2013-04-29 18:28:19 -07:00
block: change config option name for cmdline partition parsing
2013-09-30 14:31:02 -07:00
nbd: update documentation and link to mailinglist
2013-02-27 19:10:22 -08:00
memcg: document cgroup dirty/writeback memory statistics
2013-09-12 15:38:02 -07:00
TTY:console: update document console.txt
2013-05-21 10:21:57 -07:00
cpufreq: Drop the owner field from struct cpufreq_driver
2013-08-10 03:24:47 +02:00
cpuidle: make a single register function for all
2013-04-23 13:45:22 +02:00
drivers/dma: remove unused support for MEMSET operations
2013-07-03 16:07:42 -07:00
Documentation: development-process: Update -mm and -next URLs
2013-07-25 12:37:24 +02:00
dm: add statistics support
2013-09-05 20:46:06 -04:00
ARM: SoC fixes for 3.12-rc
2013-10-02 21:48:32 -07:00
- factor out common code from MTD tests
2013-09-09 10:33:19 -07:00
Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma
2013-09-10 13:37:36 -07:00
[media] get_dvb_firmware: Fix the location of firmware for Terratec HTC
2013-01-01 11:18:26 -02:00
Documentation: remove reference to 2.7 kernel in early-userspace
2013-08-20 12:47:28 +02:00
drm: Add 1600x1200 (UXGA) screen resolution to the built-in EDIDs
2013-04-12 14:06:16 +10:00
Documentation/fb/viafb.modes fix a typo
2013-08-20 12:41:11 +02:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2013-09-18 19:22:22 -05:00
doc: Fix typo "is is" in Documentations
2013-08-27 10:50:52 +02:00
HID: uhid: use generic hidinput_input_event()
2013-07-31 10:33:05 +02:00
Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
2013-09-07 10:54:19 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2013-09-06 09:36:28 -07:00
Fix example error_injection_tool
2013-04-02 09:39:55 -07:00
Merge branch 'master' into for-3.12/upstream
2013-09-04 10:49:57 +02:00
s390/sclp: Add SCLP character device driver
2013-06-26 21:10:13 +02:00
HOWTO ja_JP sync
2013-07-24 22:06:34 -07:00
kconfig: do not allow more than one symbol to have 'option modules'
2013-09-05 11:10:08 +02: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
Correct unfaithful translation on HOWTO in ko_KR
2013-08-12 17:43:13 -07:00
platform / thinkpad: Remove deprecated hotkey_report_mode parameter
2013-07-15 13:57:00 +02:00
Documentation: leds-lp5521,lp5523: update device attribute information
2013-08-26 17:22:13 -07:00
block: remove refs to XD disks from documentation
2013-05-17 15:17:12 +02:00
doc: fix misspellings with 'codespell' tool
2013-05-28 12:02:12 +02:00
doc: fix misspellings with 'codespell' tool
2013-05-28 12:02:12 +02:00
mmc: core: Add in support to expose PRV for v4 MMCs
2013-03-22 12:10:42 -04:00
doc: Fix typo "is is" in Documentations
2013-08-27 10:50:52 +02:00
userns: Recommend use of memory control groups.
2013-01-26 22:20:06 -08:00
bonding: Make alb learning packet interval configurable
2013-09-15 22:20:44 -04:00
NFC: Update pn544 documentation
2013-01-10 01:27:46 +01:00
parisc: document the shadow registers
2013-07-09 22:09:19 +02:00
PCI/MSI: Enable multiple MSIs with pci_enable_msi_block_auto()
2013-01-24 17:25:13 +01:00
power: Documentation: Update s2ram link
2013-08-27 10:54:52 +02:00
powerpc: Update the 00-Index in Documentation/powerpc
2013-08-27 14:44:27 +10:00
doc: Fix typo in doucmentations
2013-07-25 12:34:15 +02:00
Merge branches 'doc.2013.08.19a', 'fixes.2013.08.20a', 'sysidle.2013.08.31a' and 'torture.2013.08.20a' into HEAD
2013-08-31 14:44:45 -07:00
s390/cio: add condev keyword to cio_ignore
2013-05-02 15:50:20 +02:00
sched/Documentation: Update sched-design-CFS.txt documentation
2013-09-12 19:14:17 +02:00
SCSI misc on 20130915
2013-09-15 17:41:30 -04:00
Smack: add support for modification of existing rules
2013-03-19 14:16:42 -07:00
stallion: final cleanup
2013-06-03 14:31:39 -07:00
ALSA: hda - Add documentation for CS4208 fixups
2013-09-27 10:19:31 +02:00
spi/documentation: Fix usage of __initdata
2013-08-20 12:52:28 +02:00
coredump: add new %P variable in core_pattern
2013-09-11 15:59:01 -07:00
Documentation: replace strict_strtoul() with kstrtoul()
2013-08-20 12:56:26 +02:00
thermal: thermal_core: allow binding with limits on bind_params
2013-09-03 09:10:24 -04:00
nohz_full: Add testing information to documentation
2013-08-18 18:06:55 -07:00
drivers/tpm: add xen tpmfront interface
2013-08-09 10:57:06 -04:00
Documentation/trace: Correcting and extending tracepoint documentation
2013-08-27 10:57:11 +02:00
proc_usb_info.txt: Correct documentation about endianness of config descriptors
2013-08-12 12:24:27 -07:00
[media] V4L: Add support for integer menu controls with standard menu items
2013-08-18 07:12:59 -03:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2013-09-06 09:36:28 -07:00
mm: track vma changes with VM_SOFTDIRTY bit
2013-09-11 15:57:56 -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
watchdog: delete mpcore_wdt driver
2013-07-11 21:47:58 +02:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2013-09-06 09:36:28 -07:00
xtensa: document MMUv3 setup sequence
2013-05-09 01:07:09 -07:00
Documentation/zh_CN/SubmittingPatches fix a typo
2013-08-20 12:41:25 +02:00
doc: fix a typo in Documentation/00-INDEX
2013-08-27 10:53:07 +02:00
Documentation: Memory barrier semantics of atomic_xchg()
2013-01-08 14:14:55 -08: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
Documentation: fix typo and update version in cachetlb.txt
2013-08-20 12:46:52 +02:00
clk: add support for clock reparent on set_rate
2013-08-19 12:27:17 -07:00
Coccinelle: Update information about the minimal version required
2013-07-03 22:58:20 +02:00
Documentation/CodingStyle: allow multiple return statements per function
2013-07-03 16:08:01 -07:00
kernel: delete __cpuinit usage from all core kernel files
2013-07-14 19:36:59 -04:00
doc: Documentation/cputopology.txt fix typo
2013-09-04 12:59:47 +02:00
/dev/oldmem: Remove the interface
2013-07-03 16:08:03 -07:00
Documentation/DMA-API-HOWTO.txt: fix typo
2013-02-27 19:10:23 -08:00
dma-buf: Expose buffer size to userspace (v2)
2013-09-10 11:36:45 +05:30
dmatest: make module parameters writable
2013-08-22 22:57:32 -07:00
doc: fix misspellings with 'codespell' tool
2013-05-28 12:02:12 +02:00
Remove GENERIC_GPIO config option
2013-04-16 18:47:19 +09:00
Documentation: Updated broken link in HOWTO
2013-06-03 14:22:57 -07:00
hwrng: Fix a wrong comment in Documentation/hw_random.txt
2013-03-10 18:16:36 +08:00
doc: documentation/hwspinlock.txt fix typo
2013-08-27 10:46:02 +02:00
Documentation: remove depends on CONFIG_EXPERIMENTAL
2013-01-11 11:38:03 -08:00
iostats.txt: add easy-to-find description for field 6
2013-04-29 15:18:50 +02:00
ipmi: add options to disable openfirmware and PCI scanning
2013-02-27 19:10:21 -08:00
doc: fix a typo about irq affinity
2013-08-20 12:59:18 +02:00
kernel-doc: Update references to SGML to refs to XML instead.
2013-05-28 12:02:11 +02:00
block: change config option name for cmdline partition parsing
2013-09-30 14:31: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
Documentation/kmemcheck: update kmemcheck documentation
2013-08-27 10:47:05 +02:00
locking/stat: Fix a typo
2013-02-19 08:42:37 +01:00
wanrouter: completely decouple obsolete code from kernel.
2013-01-31 19:20:33 -05:00
md: remove doubled description for sync_max, merging it within sync_min/sync_max
2013-07-03 09:43:28 +10:00
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
2013-07-13 12:09:57 -07:00
doc: Fix memory-barrier control-dependency example
2013-08-19 21:39:42 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2013-09-06 09:36:28 -07:00
Documentation: pinctrl: Fix example code for pinctrl_register
2013-08-23 08:56:28 +02:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2013-09-06 09:36:28 -07:00
pwm: Add sysfs interface
2013-06-21 11:32:51 +02:00
Documentation: remove __dev* attributes.
2013-01-03 15:57:16 -08:00
sched: Rename sched.c as sched/core.c in comments and Documentation
2013-06-19 12:58:42 +02:00
rtc: add ability to push out an existing wakealarm using sysfs
2013-07-03 16:07:54 -07:00
Documentation/sparse.txt: document context annotations for lock checking
2012-12-17 17:15:23 -08:00
sched: Rename sched.c as sched/core.c in comments and Documentation
2013-06-19 12:58:42 +02:00
Finally eradicate CONFIG_HOTPLUG
2013-06-03 14:20:18 -07:00
Documentation/SubmittingPatches: Request summaries for commit references
2013-08-20 12:58:15 +02:00
doc: Fix typo in doucmentations
2013-07-25 12:34:15 +02:00
Documentation/sysrq: fix inconstistent help message of sysrq key
2013-04-30 17:04:10 -07:00
percpu: add documentation on this_cpu operations
2013-04-04 10:24:53 -07:00
vfio: fix documentation
2013-09-05 16:36:21 -06:00
workqueue: Correct/Drop references to gcwq in Documentation
2013-08-21 10:32:09 -04:00
mutex: Add support for wound/wait style locks
2013-06-26 12:10:56 +02:00
e6e7fb1ffc
