Hi Linus,
These should be the last bug fixes you get from Olof and me for 3.7.
This is based on the previous one you pulled and there is nothing
spectacular in here. I'll follow up with a second pull request
knowing that those are probably too late now, but I'd like to let
you know about the ones that didn't make it and give you the chance
to pull those anyway if you prefer.
Arnd
Merge branch 'v3.7-samsung-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fixes (2012-11-22 20:43:37 -0800)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git fixes
for you to fetch changes up to 9434d24b11ccceeb39522965593ef2ddc9eb4e7c:
Merge branch 'v3.7-samsung-fixes-4' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fixes (2012-11-29 15:07:27 +0100)
----------------------------------------------------------------
ARM: SoC fixes for 3.7
These are three fixes for the Marvell EBU family and one for the Samsung
s3c platforms. All of them are obvious should still make it into 3.7.
----------------------------------------------------------------
Arnd Bergmann (1):
Merge branch 'v3.7-samsung-fixes-4' of git://git.kernel.org/.../kgene/linux-samsung into fixes
Jason Gunthorpe (1):
ARM: Kirkwood: Update PCI-E fixup
Olof Johansson (1):
Merge tag 'orion_fixes_for_3.7' of git://git.infradead.org/users/jcooper/linux into fixes
Russell King - ARM Linux (2):
Dove: Attempt to fix PMU/RTC interrupts
Dove: Fix irq_to_pmu()
Sachin Kamat (1):
ARM: S3C24XX: Fix potential NULL pointer dereference error
arch/arm/Kconfig | 1 +
arch/arm/mach-dove/include/mach/pm.h | 2 +-
arch/arm/mach-dove/irq.c | 14 +++++++++++++-
arch/arm/mach-kirkwood/pcie.c | 11 ++++++++---
arch/arm/plat-s3c24xx/dma.c | 9 +++++----
5 files changed, 28 insertions(+), 9 deletions(-)
On Thursday 29 November 2012, Arnd Bergmann wrote:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git fixes
>
Sorry about the wrong URL, the correct one is the usual
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git tags/fixes-for-linus
which has the same commit as a signed tag.
Arnd
Hi Linus,
These are the bug fixes originally sent as part of a longer patch series by
Krzysztof Halasa. I've already queued them up for 3.8 now, since I think it's
too much churn this late in the cycle. On the other hand they have been
in Linux-next for ages and some of them look like they fix serious problems
in ixp4xx, so if you don't mind messing up the diffstat for the post-rc7
patches, you can also decide to pick them up.
Arnd
---
The following changes since commit f4a75d2eb7b1e2206094b901be09adb31ba63681:
Linux 3.7-rc6 (2012-11-16 17:42:40 -0800)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git tags/ixp4xx-fixes
for you to fetch changes up to 0d2c9f0517e915ce03a04e91d3207827e0d274a8:
IXP4xx: use __iomem for MMIO (2012-11-22 03:36:45 +0000)
----------------------------------------------------------------
ARM: ixp4xx bug fixes
These were originally prepared by Krzysztof Halasa but not submitted
in time for v3.7 due to some confusion about how ixp4xx patches should
be handled. Jason Cooper thankfully offered to help out sending the
patches upstream through arm-soc now, but given the timing, we could
as well delay them for 3.8.
----------------------------------------------------------------
Arnd Bergmann (1):
IXP4xx: use __iomem for MMIO
Krzysztof Hałasa (9):
IXP4xx: Fix Goramo MultiLink platform compilation.
IXP4xx: Fix off-by-one bug in Goramo MultiLink platform.
IXP4xx: HW pseudo-random generator is available on IXP45x/46x only.
IXP4xx: ixp4xx_crypto driver requires Queue Manager and NPE drivers.
IXP4xx: Remove time limit for PCI TRDY to enable use of slow devices.
WAN: Remove redundant HDLC info printed by IXP4xx HSS driver.
IXP4xx crypto: MOD_AES{128,192,256} already include key size.
IXP4xx: Always ioremap() Queue Manager MMIO region at boot.
IXP4xx: map CPU config registers within VMALLOC region.
Tim Gardner (1):
ixp4xx: Declare MODULE_FIRMWARE usage
arch/arm/mach-ixp4xx/common-pci.c | 1 +
arch/arm/mach-ixp4xx/common.c | 13 +++++--------
arch/arm/mach-ixp4xx/goramo_mlr.c | 3 ++-
arch/arm/mach-ixp4xx/include/mach/debug-macro.S | 4 ++--
arch/arm/mach-ixp4xx/include/mach/ixp4xx-regs.h | 46 +++++++++++++++++++---------------------------
arch/arm/mach-ixp4xx/include/mach/qmgr.h | 12 ++++++------
arch/arm/mach-ixp4xx/ixp4xx_npe.c | 9 ++++++++-
arch/arm/mach-ixp4xx/ixp4xx_qmgr.c | 12 +-----------
drivers/char/hw_random/Kconfig | 6 +++---
drivers/char/hw_random/ixp4xx-rng.c | 5 ++++-
drivers/crypto/Kconfig | 2 +-
drivers/crypto/ixp4xx_crypto.c | 12 ++++++------
drivers/net/wan/ixp4xx_hss.c | 2 +-
13 files changed, 59 insertions(+), 68 deletions(-)
On Thu, Nov 29, 2012 at 02:24:25PM +0000, Arnd Bergmann wrote:
> Hi Linus,
>
> These should be the last bug fixes you get from Olof and me for 3.7.
> This is based on the previous one you pulled and there is nothing
> spectacular in here. I'll follow up with a second pull request
> knowing that those are probably too late now, but I'd like to let
> you know about the ones that didn't make it and give you the chance
> to pull those anyway if you prefer.
I don't see anything in here for the OMAP warning that I've been reporting
for the last two weeks. What's going on with getting fixes merged into
arm-soc?
On Thu, Nov 29, 2012 at 12:07 PM, Russell King - ARM Linux
<[email protected]> wrote:
> On Thu, Nov 29, 2012 at 02:24:25PM +0000, Arnd Bergmann wrote:
>> Hi Linus,
>>
>> These should be the last bug fixes you get from Olof and me for 3.7.
>> This is based on the previous one you pulled and there is nothing
>> spectacular in here. I'll follow up with a second pull request
>> knowing that those are probably too late now, but I'd like to let
>> you know about the ones that didn't make it and give you the chance
>> to pull those anyway if you prefer.
>
> I don't see anything in here for the OMAP warning that I've been reporting
> for the last two weeks. What's going on with getting fixes merged into
> arm-soc?
I've merged it in now (for 3.8) -- the pull request from Tony had been
pending for a couple of days. Should mirror out shortly.
-Olof