[GIT PULL]

[GIT PULL]

[Stephen Warren]

Mark,

Could you please pull the following branches into ASoC's for-next:

git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git topic/mmio

git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git
topic/stride

Those two are a dependency for the Tegra20 ASoC regmap conversion that I
can post now.

git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git topic/name

That is an additional dependency for the new Tegra30 ASoC drivers.

Thanks.

Re: [GIT PULL]

[Mark Brown]

[-- Attachment #1.1: Type: text/plain, Size: 197 bytes --]

On Tue, Apr 10, 2012 at 01:05:47PM -0600, Stephen Warren wrote:

> Could you please pull the following branches into ASoC's for-next:

I'll do that whenever I'm merging things with dependencies...

[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

[-- Attachment #2: Type: text/plain, Size: 0 bytes --]

Re: [GIT PULL]

[pr-tracker-bot]

The pull request you sent on Tue, 09 Aug 2022 14:27:25 +0100:

> git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git tags/fscache-fixes-20220809

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/15205c2829ca2cbb5ece5ceaafe1171a8470e62b

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html

[GIT PULL]

[David Howells]

Hi Linus,

Can you pull these two patches please?  The first fixes a cookie access ref
leak if a cookie is invalidated a second time before the first invalidation
is actually processed.  The second adds a tracepoint to log cookie look up
failure.

Thanks,
David

Link: https://listman.redhat.com/archives/linux-cachefs/2022-August/007061.html
Link: https://listman.redhat.com/archives/linux-cachefs/2022-August/007062.html
---
The following changes since commit 3d7cb6b04c3f3115719235cc6866b10326de34cd:

  Linux 5.19 (2022-07-31 14:03:01 -0700)

are available in the Git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git tags/fscache-fixes-20220809

for you to fetch changes up to 1a1e3aca9d4957e282945cdc2b58e7c560b8e0d2:

  fscache: add tracepoint when failing cookie (2022-08-09 14:13:59 +0100)

----------------------------------------------------------------
fscache fixes

----------------------------------------------------------------
Jeff Layton (2):
      fscache: don't leak cookie access refs if invalidation is in progress or failed
      fscache: add tracepoint when failing cookie

 fs/fscache/cookie.c            | 9 +++++++--
 include/trace/events/fscache.h | 2 ++
 2 files changed, 9 insertions(+), 2 deletions(-)

Re: [GIT PULL]

[pr-tracker-bot]

The pull request you sent on Fri, 03 Jun 2022 14:20:38 -0500:

> git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git ptrace_stop-cleanup-for-v5.19

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/67850b7bdcd2803e10d019f0da5673a92139b43a

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html

[GIT PULL]

[Eric W. Biederman]

Linus,

Please pull the ptrace_stop-cleanup-for-v5.19 tag from the git tree:

  git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git ptrace_stop-cleanup-for-v5.19
  HEAD: 31cae1eaae4fd65095ad6a3659db467bc3c2599e sched,signal,ptrace: Rework TASK_TRACED, TASK_STOPPED state

While looking at the ptrace problems with PREEMPT_RT and the problems
of Peter Zijlstra was encountering with ptrace in his freezer rewrite
I identified some cleanups to ptrace_stop that make sense on their own
and move make resolving the other problems much simpler.

The biggest issue is the habbit of the ptrace code to change task->__state
from the tracer to suppress TASK_WAKEKILL from waking up the tracee.  No
other code in the kernel does that and it is straight forward to update
signal_wake_up and friends to make that unnecessary.

Peter's task freezer sets frozen tasks to a new state TASK_FROZEN and
then it stores them by calling "wake_up_state(t, TASK_FROZEN)" relying
on the fact that all stopped states except the special stop states can
tolerate spurious wake up and recover their state.

The state of stopped and traced tasked is changed to be stored in
task->jobctl as well as in task->__state.  This makes it possible for
the freezer to recover tasks in these special states, as well as
serving as a general cleanup.  With a little more work in that
direction I believe TASK_STOPPED can learn to tolerate spurious wake
ups and become an ordinary stop state.

The TASK_TRACED state has to remain a special state as the registers for
a process are only reliably available when the process is stopped in
the scheduler.  Fundamentally ptrace needs acess to the saved
register values of a task.

There are bunch of semi-random ptrace related cleanups that were found
while looking at these issues.

One cleanup that deserves to be called out is from commit 57b6de08b5f6
("ptrace: Admit ptrace_stop can generate spuriuos SIGTRAPs").  This
makes a change that is technically user space visible, in the handling
of what happens to a tracee when a tracer dies unexpectedly.
According to our testing and our understanding of userspace nothing
cares that spurious SIGTRAPs can be generated in that case.

The entire discussion can be found at:
  https://lkml.kernel.org/r/87a6bv6dl6.fsf_-_@email.froward.int.ebiederm.org

Eric W. Biederman (11):
      signal: Rename send_signal send_signal_locked
      signal: Replace __group_send_sig_info with send_signal_locked
      ptrace/um: Replace PT_DTRACE with TIF_SINGLESTEP
      ptrace/xtensa: Replace PT_SINGLESTEP with TIF_SINGLESTEP
      ptrace: Remove arch_ptrace_attach
      signal: Use lockdep_assert_held instead of assert_spin_locked
      ptrace: Reimplement PTRACE_KILL by always sending SIGKILL
      ptrace: Document that wait_task_inactive can't fail
      ptrace: Admit ptrace_stop can generate spuriuos SIGTRAPs
      ptrace: Don't change __state
      ptrace: Always take siglock in ptrace_resume

Peter Zijlstra (1):
      sched,signal,ptrace: Rework TASK_TRACED, TASK_STOPPED state

 arch/ia64/include/asm/ptrace.h    |   4 --
 arch/ia64/kernel/ptrace.c         |  57 ----------------
 arch/um/include/asm/thread_info.h |   2 +
 arch/um/kernel/exec.c             |   2 +-
 arch/um/kernel/process.c          |   2 +-
 arch/um/kernel/ptrace.c           |   8 +--
 arch/um/kernel/signal.c           |   4 +-
 arch/x86/kernel/step.c            |   3 +-
 arch/xtensa/kernel/ptrace.c       |   4 +-
 arch/xtensa/kernel/signal.c       |   4 +-
 drivers/tty/tty_jobctrl.c         |   4 +-
 include/linux/ptrace.h            |   7 --
 include/linux/sched.h             |  10 ++-
 include/linux/sched/jobctl.h      |   8 +++
 include/linux/sched/signal.h      |  20 ++++--
 include/linux/signal.h            |   3 +-
 kernel/ptrace.c                   |  87 ++++++++---------------
 kernel/sched/core.c               |   5 +-
 kernel/signal.c                   | 140 +++++++++++++++++---------------------
 kernel/time/posix-cpu-timers.c    |   6 +-
 20 files changed, 140 insertions(+), 240 deletions(-)

Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>

p.s.  My apologies this is coming in so late, everyone in my house has
been sick.

[GIT PULL]

[Eric W. Biederman]

Linus,

Please pull the ucount-rlimit-fixes-for-v5.16 branch from the git tree:

  git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git ucount-rlimit-fixes-for-v5.16

  HEAD: 59ec71575ab440cd5ca0aa53b2a2985b3639fad4 ucounts: Fix rlimit max values check

This fixes a silly logic bug in the ucount rlimits code, where it was
comparing against the wrong limit.  As the fix is quite small it is
included in it's entirety below.

Eric

From 59ec71575ab440cd5ca0aa53b2a2985b3639fad4 Mon Sep 17 00:00:00 2001
From: Alexey Gladkov <legion@kernel.org>
Date: Mon, 29 Nov 2021 21:37:25 +0100
Subject: [PATCH] ucounts: Fix rlimit max values check

The semantics of the rlimit max values differs from ucounts itself. When
creating a new userns, we store the current rlimit of the process in
ucount_max. Thus, the value of the limit in the parent userns is saved
in the created one.

The problem is that now we are taking the maximum value for counter from
the same userns. So for init_user_ns it will always be RLIM_INFINITY.

To fix the problem we need to check the counter value with the max value
stored in userns.

Reproducer:

su - test -c "ulimit -u 3; sleep 5 & sleep 6 & unshare -U --map-root-user sh -c 'sleep 7 & sleep 8 & date; wait'"

Before:

[1] 175
[2] 176
Fri Nov 26 13:48:20 UTC 2021
[1]-  Done                    sleep 5
[2]+  Done                    sleep 6

After:

[1] 167
[2] 168
sh: fork: retry: Resource temporarily unavailable
sh: fork: retry: Resource temporarily unavailable
sh: fork: retry: Resource temporarily unavailable
sh: fork: retry: Resource temporarily unavailable
sh: fork: retry: Resource temporarily unavailable
sh: fork: retry: Resource temporarily unavailable
sh: fork: retry: Resource temporarily unavailable
sh: fork: Interrupted system call
[1]-  Done                    sleep 5
[2]+  Done                    sleep 6

Fixes: c54b245d0118 ("Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace")
Reported-by: Gleb Fotengauer-Malinovskiy <glebfm@altlinux.org>
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Alexey Gladkov <legion@kernel.org>
Link: https://lkml.kernel.org/r/024ec805f6e16896f0b23e094773790d171d2c1c.1638218242.git.legion@kernel.org
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
---
 kernel/ucount.c | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/kernel/ucount.c b/kernel/ucount.c
index 4f5613dac227..7b32c356ebc5 100644
--- a/kernel/ucount.c
+++ b/kernel/ucount.c
@@ -264,15 +264,16 @@ void dec_ucount(struct ucounts *ucounts, enum ucount_type type)
 long inc_rlimit_ucounts(struct ucounts *ucounts, enum ucount_type type, long v)
 {
 	struct ucounts *iter;
+	long max = LONG_MAX;
 	long ret = 0;
 
 	for (iter = ucounts; iter; iter = iter->ns->ucounts) {
-		long max = READ_ONCE(iter->ns->ucount_max[type]);
 		long new = atomic_long_add_return(v, &iter->ucount[type]);
 		if (new < 0 || new > max)
 			ret = LONG_MAX;
 		else if (iter == ucounts)
 			ret = new;
+		max = READ_ONCE(iter->ns->ucount_max[type]);
 	}
 	return ret;
 }
@@ -312,15 +313,16 @@ long inc_rlimit_get_ucounts(struct ucounts *ucounts, enum ucount_type type)
 {
 	/* Caller must hold a reference to ucounts */
 	struct ucounts *iter;
+	long max = LONG_MAX;
 	long dec, ret = 0;
 
 	for (iter = ucounts; iter; iter = iter->ns->ucounts) {
-		long max = READ_ONCE(iter->ns->ucount_max[type]);
 		long new = atomic_long_add_return(1, &iter->ucount[type]);
 		if (new < 0 || new > max)
 			goto unwind;
 		if (iter == ucounts)
 			ret = new;
+		max = READ_ONCE(iter->ns->ucount_max[type]);
 		/*
 		 * Grab an extra ucount reference for the caller when
 		 * the rlimit count was previously 0.
@@ -339,15 +341,16 @@ long inc_rlimit_get_ucounts(struct ucounts *ucounts, enum ucount_type type)
 	return 0;
 }
 
-bool is_ucounts_overlimit(struct ucounts *ucounts, enum ucount_type type, unsigned long max)
+bool is_ucounts_overlimit(struct ucounts *ucounts, enum ucount_type type, unsigned long rlimit)
 {
 	struct ucounts *iter;
-	if (get_ucounts_value(ucounts, type) > max)
-		return true;
+	long max = rlimit;
+	if (rlimit > LONG_MAX)
+		max = LONG_MAX;
 	for (iter = ucounts; iter; iter = iter->ns->ucounts) {
-		max = READ_ONCE(iter->ns->ucount_max[type]);
 		if (get_ucounts_value(iter, type) > max)
 			return true;
+		max = READ_ONCE(iter->ns->ucount_max[type]);
 	}
 	return false;
 }
-- 
2.29.2

[GIT PULL]

[Eric W. Biederman]

Linus,

Please pull the ucount-rlimit-fixes-for-v5.16 branch from the git tree:

  git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git ucount-rlimit-fixes-for-v5.16

  HEAD: 59ec71575ab440cd5ca0aa53b2a2985b3639fad4 ucounts: Fix rlimit max values check

This fixes a silly logic bug in the ucount rlimits code, where it was
comparing against the wrong limit.  As the fix is quite small it is
included in it's entirety below.

Eric

From 59ec71575ab440cd5ca0aa53b2a2985b3639fad4 Mon Sep 17 00:00:00 2001
From: Alexey Gladkov <legion@kernel.org>
Date: Mon, 29 Nov 2021 21:37:25 +0100
Subject: [PATCH] ucounts: Fix rlimit max values check

The semantics of the rlimit max values differs from ucounts itself. When
creating a new userns, we store the current rlimit of the process in
ucount_max. Thus, the value of the limit in the parent userns is saved
in the created one.

The problem is that now we are taking the maximum value for counter from
the same userns. So for init_user_ns it will always be RLIM_INFINITY.

To fix the problem we need to check the counter value with the max value
stored in userns.

Reproducer:

su - test -c "ulimit -u 3; sleep 5 & sleep 6 & unshare -U --map-root-user sh -c 'sleep 7 & sleep 8 & date; wait'"

Before:

[1] 175
[2] 176
Fri Nov 26 13:48:20 UTC 2021
[1]-  Done                    sleep 5
[2]+  Done                    sleep 6

After:

[1] 167
[2] 168
sh: fork: retry: Resource temporarily unavailable
sh: fork: retry: Resource temporarily unavailable
sh: fork: retry: Resource temporarily unavailable
sh: fork: retry: Resource temporarily unavailable
sh: fork: retry: Resource temporarily unavailable
sh: fork: retry: Resource temporarily unavailable
sh: fork: retry: Resource temporarily unavailable
sh: fork: Interrupted system call
[1]-  Done                    sleep 5
[2]+  Done                    sleep 6

Fixes: c54b245d0118 ("Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace")
Reported-by: Gleb Fotengauer-Malinovskiy <glebfm@altlinux.org>
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Alexey Gladkov <legion@kernel.org>
Link: https://lkml.kernel.org/r/024ec805f6e16896f0b23e094773790d171d2c1c.1638218242.git.legion@kernel.org
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
---
 kernel/ucount.c | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/kernel/ucount.c b/kernel/ucount.c
index 4f5613dac227..7b32c356ebc5 100644
--- a/kernel/ucount.c
+++ b/kernel/ucount.c
@@ -264,15 +264,16 @@ void dec_ucount(struct ucounts *ucounts, enum ucount_type type)
 long inc_rlimit_ucounts(struct ucounts *ucounts, enum ucount_type type, long v)
 {
 	struct ucounts *iter;
+	long max = LONG_MAX;
 	long ret = 0;
 
 	for (iter = ucounts; iter; iter = iter->ns->ucounts) {
-		long max = READ_ONCE(iter->ns->ucount_max[type]);
 		long new = atomic_long_add_return(v, &iter->ucount[type]);
 		if (new < 0 || new > max)
 			ret = LONG_MAX;
 		else if (iter == ucounts)
 			ret = new;
+		max = READ_ONCE(iter->ns->ucount_max[type]);
 	}
 	return ret;
 }
@@ -312,15 +313,16 @@ long inc_rlimit_get_ucounts(struct ucounts *ucounts, enum ucount_type type)
 {
 	/* Caller must hold a reference to ucounts */
 	struct ucounts *iter;
+	long max = LONG_MAX;
 	long dec, ret = 0;
 
 	for (iter = ucounts; iter; iter = iter->ns->ucounts) {
-		long max = READ_ONCE(iter->ns->ucount_max[type]);
 		long new = atomic_long_add_return(1, &iter->ucount[type]);
 		if (new < 0 || new > max)
 			goto unwind;
 		if (iter == ucounts)
 			ret = new;
+		max = READ_ONCE(iter->ns->ucount_max[type]);
 		/*
 		 * Grab an extra ucount reference for the caller when
 		 * the rlimit count was previously 0.
@@ -339,15 +341,16 @@ long inc_rlimit_get_ucounts(struct ucounts *ucounts, enum ucount_type type)
 	return 0;
 }
 
-bool is_ucounts_overlimit(struct ucounts *ucounts, enum ucount_type type, unsigned long max)
+bool is_ucounts_overlimit(struct ucounts *ucounts, enum ucount_type type, unsigned long rlimit)
 {
 	struct ucounts *iter;
-	if (get_ucounts_value(ucounts, type) > max)
-		return true;
+	long max = rlimit;
+	if (rlimit > LONG_MAX)
+		max = LONG_MAX;
 	for (iter = ucounts; iter; iter = iter->ns->ucounts) {
-		max = READ_ONCE(iter->ns->ucount_max[type]);
 		if (get_ucounts_value(iter, type) > max)
 			return true;
+		max = READ_ONCE(iter->ns->ucount_max[type]);
 	}
 	return false;
 }
-- 
2.29.2

Re: [GIT PULL]

[Kevin Hilman]

On Mon, Feb 11, 2019 at 12:48 PM Kevin Hilman <khilman@baylibre.com> wrote:
>
> The following changes since commit bfeffd155283772bbe78c6a05dec7c0128ee500c:
>
>   Linux 5.0-rc1 (2019-01-06 17:08:20 -0800)
>
> are available in the Git repository at:
>
>   https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic.git tags/amlogic-soc
>
> for you to fetch changes up to b3077ffcfa24b05c05af3b990d97a392ef88b22e:
>
>   arm64: meson: enable g12a clock controller (2019-02-08 09:30:25 -0800)
>
> ----------------------------------------------------------------
> Amlogic SoC Kconfig updates for v5.1:
> - arm64: meson: enable g12a clock controller
> - drop unneeded COMMON_CLK_AMLOGIC

Please ignore, resent with proper subject line.

Sorry for the noise.

Kevin

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: [GIT PULL]

[Kevin Hilman]

On Mon, Feb 11, 2019 at 12:48 PM Kevin Hilman <khilman@baylibre.com> wrote:
>
> The following changes since commit bfeffd155283772bbe78c6a05dec7c0128ee500c:
>
>   Linux 5.0-rc1 (2019-01-06 17:08:20 -0800)
>
> are available in the Git repository at:
>
>   https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic.git tags/amlogic-soc
>
> for you to fetch changes up to b3077ffcfa24b05c05af3b990d97a392ef88b22e:
>
>   arm64: meson: enable g12a clock controller (2019-02-08 09:30:25 -0800)
>
> ----------------------------------------------------------------
> Amlogic SoC Kconfig updates for v5.1:
> - arm64: meson: enable g12a clock controller
> - drop unneeded COMMON_CLK_AMLOGIC

Please ignore, resent with proper subject line.

Sorry for the noise.

Kevin

_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic

[GIT PULL]

[Kevin Hilman]

The following changes since commit bfeffd155283772bbe78c6a05dec7c0128ee500c:

  Linux 5.0-rc1 (2019-01-06 17:08:20 -0800)

are available in the Git repository at:

  https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic.git tags/amlogic-soc

for you to fetch changes up to b3077ffcfa24b05c05af3b990d97a392ef88b22e:

  arm64: meson: enable g12a clock controller (2019-02-08 09:30:25 -0800)

----------------------------------------------------------------
Amlogic SoC Kconfig updates for v5.1:
- arm64: meson: enable g12a clock controller
- drop unneeded COMMON_CLK_AMLOGIC

----------------------------------------------------------------
Jerome Brunet (3):
      arm64: meson: remove COMMON_CLK_AMLOGIC selection
      ARM: meson: remove COMMON_CLK_AMLOGIC selection
      arm64: meson: enable g12a clock controller

 arch/arm/mach-meson/Kconfig  | 1 -
 arch/arm64/Kconfig.platforms | 5 +++--
 2 files changed, 3 insertions(+), 3 deletions(-)

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

[GIT PULL]

[Kevin Hilman]

The following changes since commit bfeffd155283772bbe78c6a05dec7c0128ee500c:

  Linux 5.0-rc1 (2019-01-06 17:08:20 -0800)

are available in the Git repository at:

  https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic.git tags/amlogic-soc

for you to fetch changes up to b3077ffcfa24b05c05af3b990d97a392ef88b22e:

  arm64: meson: enable g12a clock controller (2019-02-08 09:30:25 -0800)

----------------------------------------------------------------
Amlogic SoC Kconfig updates for v5.1:
- arm64: meson: enable g12a clock controller
- drop unneeded COMMON_CLK_AMLOGIC

----------------------------------------------------------------
Jerome Brunet (3):
      arm64: meson: remove COMMON_CLK_AMLOGIC selection
      ARM: meson: remove COMMON_CLK_AMLOGIC selection
      arm64: meson: enable g12a clock controller

 arch/arm/mach-meson/Kconfig  | 1 -
 arch/arm64/Kconfig.platforms | 5 +++--
 2 files changed, 3 insertions(+), 3 deletions(-)

_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic

[GIT PULL]

[Frederic Weisbecker]

Ingo,

Please pull the softirq/mask-v4 branch that can be found at:

git://git.kernel.org/pub/scm/linux/kernel/git/frederic/linux-dynticks.git
	softirq/mask-v4

HEAD: dc06cbb5e1296938211040bccdacd7a361469116

Changes since v3:

* Rebase against v4.17-rc4
* Fix build error on SH. (new patch "sh: Use nmi_count() on /proc/interrupts print out")

--
The softirq mask and its accessors/mutators have many implementations
scattered around many architectures. Most do the same things consisting
in a field in a per-cpu struct (often irq_cpustat_t) accessed through
per-cpu ops. We can provide instead a generic efficient version that
most of them can use. In fact s390 is the only exception because the
field is stored in lowcore.

Thanks,
	Frederic
---

Frederic Weisbecker (11):
      ia64: Convert local_softirq_pending() to per-cpu ops
      sparc: Convert local_softirq_pending() to use per-cpu op
      sh: Use nmi_count() on /proc/interrupts print out
      softirq: Turn default irq_cpustat_t to standard per-cpu
      softirq: Consolidate default local_softirq_pending() implementations
      ia64: Switch to generic local_softirq_pending() implementation
      parisc: Switch to generic local_softirq_pending() implementation
      powerpc: Switch to generic local_softirq_pending() implementation
      sparc: Switch to generic local_softirq_pending() implementation
      x86: Switch to generic local_softirq_pending() implementation
      softirq/s390: Move default mutators of overwritten softirq mask to s390


 arch/ia64/include/asm/hardirq.h     |  2 +-
 arch/parisc/include/asm/hardirq.h   |  8 --------
 arch/powerpc/include/asm/hardirq.h  |  7 -------
 arch/s390/include/asm/hardirq.h     |  2 ++
 arch/sh/kernel/irq.c                |  2 +-
 arch/sparc/include/asm/hardirq_64.h |  5 +++--
 arch/x86/include/asm/hardirq.h      |  8 --------
 include/linux/interrupt.h           | 13 ++++++++++---
 include/linux/irq_cpustat.h         | 10 +++-------
 kernel/softirq.c                    |  4 ++--
 10 files changed, 22 insertions(+), 39 deletions(-)

[GIT PULL]

[David Howells]

Hi James,

Can you pull and pass these patches on to Linus?

There are two:

 (1) Fix the assoc_array implemetation to never call the compare_object op
     on non-leaf objects.

 (2) Fix an error check in the ASN.1 decoder compiler.

Thanks,
David
---
The following changes since commit 541d8f4d59d79f5d37c8c726f723d42ff307db57:

  Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm (2016-04-05 16:16:00 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git tags/keys-fixes-20160412

for you to fetch changes up to 952cca6a724c420a1efb6025e41862dfd2c1edc3:

  ASN.1: fix open failure check on headername (2016-04-06 14:06:48 +0100)

----------------------------------------------------------------
Keyrings fixes

----------------------------------------------------------------
Colin Ian King (1):
      ASN.1: fix open failure check on headername

Jerome Marchand (1):
      assoc_array: don't call compare_object() on a node

 lib/assoc_array.c       | 4 +++-
 scripts/asn1_compiler.c | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

Re: [GIT PULL]

[Stephen Boyd]

On 07/15, Tero Kristo wrote:
> Hi Stephen, Mike,
> 
> Here is the updated pull-request based on Stephen's request. This is
> on top of 4.1-rc2. The branch is force updated version of the one
> Stephen tried yesterday, the old one contained the minor build
> issues present on v3 of the patch set.
> 
> I did a quick try of merging this branch on top of 4.2-rc2 and it
> works fine without any conflicts.
> 

Thanks. Pulled into clk-next.

-- 
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project

[GIT PULL]

[Tero Kristo]

Hi Stephen, Mike,

Here is the updated pull-request based on Stephen's request. This is on 
top of 4.1-rc2. The branch is force updated version of the one Stephen 
tried yesterday, the old one contained the minor build issues present on 
v3 of the patch set.

I did a quick try of merging this branch on top of 4.2-rc2 and it works 
fine without any conflicts.

-Tero

----------------------------------------------------------------

The following changes since commit 5ebe6afaf0057ac3eaeb98defd5456894b446d22:

   Linux 4.1-rc2 (2015-05-03 19:22:23 -0700)

are available in the git repository at:

   https://github.com/t-kristo/linux-pm.git for-4.2/ti-clk-move

for you to fetch changes up to 989feafb84118a840ff21250a1e5f516f43e3dbb:

   clk: ti: move low-level access and init code under clock driver 
(2015-06-02 12:31:46 +0300)

----------------------------------------------------------------
Tero Kristo (27):
       ARM: OMAP2+: clock: export driver API to setup/get clock features
       clk: ti: move generic OMAP DPLL implementation under drivers/clk
       clk: ti: move OMAP4+ DPLL implementation under drivers/clk
       clk: ti: move interface clock implementation under drivers/clk
       ARM: OMAP3: dpll3-m2: get rid of obsolete clksel access
       ARM: OMAP2+: clk: remove obsolete clksel support code
       ARM: OMAP2+: clock: remove clock_common_data.c file
       ARM: OMAP36xx: remove clock36xx.c/.h files
       clk: ti: autoidle: move generic autoidle handling code to clock 
driver
       clk: ti: move omap2_clk_enable_init_clocks under clock driver
       ARM: OMAP2+: clock: remove support for legacy mpurate command 
line param
       ARM: OMAP2+: clock: add support for clkdm ops to the low level 
clk ops
       ARM: OMAP2+: clock: add support for specific CM ops to ti_clk_ll_ops
       clk: ti: dpll: move omap3 DPLL functionality to clock driver
       ARM: OMAP3: clock: remove clock3xxx.c file
       ARM: OMAP2+: clock: remove clkdm_control static boolean from code
       clk: ti: dflt: move support for default gate clock to clock driver
       clk: ti: omap2430: move clock support code under clock driver
       clk: ti: clkdm: move clkdm gate clock support code to clock driver
       clk: ti: omap34xx: move omap34xx clock type support code to clock 
driver
       ARM: OMAP4: clock: remove clock44xx.h header
       clk: ti: am3517: move remaining am3517 clock support code to 
clock driver
       clk: ti: move some public definitions to private header
       ARM: OMAP2+: clock: remove dead definitions from the clock header 
file
       clk: ti: remove exported ll_ops struct, instead add an API for 
registration
       ARM: OMAP2+: clock: remove legacy omap2_clk_readl/writel APIs
       clk: ti: move low-level access and init code under clock driver

  arch/arm/mach-omap2/Makefile                       |   22 +-
  arch/arm/mach-omap2/clkt34xx_dpll3m2.c             |    7 +-
  arch/arm/mach-omap2/clkt_clksel.c                  |  466 --------------
  arch/arm/mach-omap2/clkt_iclk.c                    |   68 --
  arch/arm/mach-omap2/clock.c                        |  675 
+-------------------
  arch/arm/mach-omap2/clock.h                        |  205 +-----
  arch/arm/mach-omap2/clock2430.c                    |   57 --
  arch/arm/mach-omap2/clock2xxx.c                    |   57 --
  arch/arm/mach-omap2/clock34xx.c                    |  138 ----
  arch/arm/mach-omap2/clock34xx.h                    |   18 -
  arch/arm/mach-omap2/clock3517.c                    |  118 ----
  arch/arm/mach-omap2/clock3517.h                    |   14 -
  arch/arm/mach-omap2/clock36xx.c                    |   69 --
  arch/arm/mach-omap2/clock36xx.h                    |   13 -
  arch/arm/mach-omap2/clock3xxx.c                    |  135 ----
  arch/arm/mach-omap2/clock44xx.h                    |   20 -
  arch/arm/mach-omap2/clock_common_data.c            |  115 ----
  arch/arm/mach-omap2/io.c                           |    3 +-
  drivers/clk/ti/Makefile                            |   17 +-
  drivers/clk/ti/apll.c                              |    2 +
  drivers/clk/ti/autoidle.c                          |  121 +++-
  drivers/clk/ti/clk-2xxx.c                          |    2 +
  drivers/clk/ti/clk-33xx.c                          |    2 +
  drivers/clk/ti/clk-3xxx.c                          |  244 +++++++
  drivers/clk/ti/clk-43xx.c                          |    2 +
  drivers/clk/ti/clk-44xx.c                          |    2 +
  drivers/clk/ti/clk-54xx.c                          |    2 +
  drivers/clk/ti/clk-7xx.c                           |    3 +-
  drivers/clk/ti/clk-816x.c                          |    2 +
  drivers/clk/ti/clk.c                               |  145 ++++-
  drivers/clk/ti/clkt_dflt.c                         |  316 +++++++++
  .../arm/mach-omap2 => drivers/clk/ti}/clkt_dpll.c  |   27 +-
  drivers/clk/ti/clkt_iclk.c                         |  101 +++
  drivers/clk/ti/clock.h                             |  113 ++++
  drivers/clk/ti/clockdomain.c                       |   78 +++
  {arch/arm/mach-omap2 => drivers/clk/ti}/dpll3xxx.c |  157 ++---
  {arch/arm/mach-omap2 => drivers/clk/ti}/dpll44xx.c |   23 +-
  drivers/clk/ti/fixed-factor.c                      |    2 +
  include/linux/clk/ti.h                             |  157 ++---
  39 files changed, 1328 insertions(+), 2390 deletions(-)
  delete mode 100644 arch/arm/mach-omap2/clkt_clksel.c
  delete mode 100644 arch/arm/mach-omap2/clkt_iclk.c
  delete mode 100644 arch/arm/mach-omap2/clock2430.c
  delete mode 100644 arch/arm/mach-omap2/clock2xxx.c
  delete mode 100644 arch/arm/mach-omap2/clock34xx.c
  delete mode 100644 arch/arm/mach-omap2/clock34xx.h
  delete mode 100644 arch/arm/mach-omap2/clock3517.c
  delete mode 100644 arch/arm/mach-omap2/clock3517.h
  delete mode 100644 arch/arm/mach-omap2/clock36xx.c
  delete mode 100644 arch/arm/mach-omap2/clock36xx.h
  delete mode 100644 arch/arm/mach-omap2/clock3xxx.c
  delete mode 100644 arch/arm/mach-omap2/clock44xx.h
  delete mode 100644 arch/arm/mach-omap2/clock_common_data.c
  create mode 100644 drivers/clk/ti/clkt_dflt.c
  rename {arch/arm/mach-omap2 => drivers/clk/ti}/clkt_dpll.c (94%)
  create mode 100644 drivers/clk/ti/clkt_iclk.c
  rename {arch/arm/mach-omap2 => drivers/clk/ti}/dpll3xxx.c (84%)
  rename {arch/arm/mach-omap2 => drivers/clk/ti}/dpll44xx.c (91%)

[GIT PULL]

[Olof Johansson]

Hi,

On Sun, Jul 1, 2012 at 8:40 AM, Roland Stigge <stigge@antcom.de> wrote:

> Building upon the branch you just pulled, I'll separate out the further
> patches into topic branches. Is there a certain set of those which I
> should use to adjust to arm-soc structure? E.g.:
>
> lpc32xx/core
> lpc32xx/defconfig
> lpc32xx/dts
>
> ?
>
> Thanks for pointing this out!

Yep, that looks good.

In general, we've had the following categories in arm-soc:

* non-critical-fixes
* cleanup
* dts updates
* SoC support updates
* SoC driver updates
* power-management related changes
* clock related changes
* pinctrl related changes
+ other topics depending on what's going on that merge window
(defconfig, maintainers, etc).


Thanks!

-Olof

[GIT PULL]

[Roland Stigge]

Hi,

On 01/07/12 01:29, Olof Johansson wrote:
>> This time, purely mach-lpc32xx specific patches.
>>
>> Please tell if sth. is missing, so I can know if I can build upon that. (I'm
>> already collecting new patches on top of this branch.)
> 
> I'm very sorry for the slow response to this pull request.
> 
> The contents of it in itself looks good, but given the amount of
> patches that you are building up now, I think it's time to start
> organizing into topic branches that fit the structure of arm-soc a bit
> better.
> 
> In other words, it makes sense to separate out things such as dts
> updates in their own branch, core SoC updates in one, etc.
> 
> Given that you've based other work on top of this combined branch now,
> and the fact that I should have gotten back to you sooner about it,
> I'm going to pull it in under our next/soc branch this time. But I'd
> like to see more topic-oriented pull requests in the future, ideally
> for your updates here but definitely in the branches you stage for
> 3.7.

I'm fine with this.

Building upon the branch you just pulled, I'll separate out the further
patches into topic branches. Is there a certain set of those which I
should use to adjust to arm-soc structure? E.g.:

lpc32xx/core
lpc32xx/defconfig
lpc32xx/dts

?

Thanks for pointing this out!

Roland

[GIT PULL]

[Olof Johansson]

Hi,

On Mon, Jun 18, 2012 at 1:48 PM, Roland Stigge <stigge@antcom.de> wrote:
> Hi Arnd and Olof,
>
> this is the pull request for the 22 patches we discussed last week, still same
> commits in the same branch (the 23rd patch was removed from the series, as
> discussed on the list).
>
> This time, purely mach-lpc32xx specific patches.
>
> Please tell if sth. is missing, so I can know if I can build upon that. (I'm
> already collecting new patches on top of this branch.)

I'm very sorry for the slow response to this pull request.

The contents of it in itself looks good, but given the amount of
patches that you are building up now, I think it's time to start
organizing into topic branches that fit the structure of arm-soc a bit
better.

In other words, it makes sense to separate out things such as dts
updates in their own branch, core SoC updates in one, etc.

Given that you've based other work on top of this combined branch now,
and the fact that I should have gotten back to you sooner about it,
I'm going to pull it in under our next/soc branch this time. But I'd
like to see more topic-oriented pull requests in the future, ideally
for your updates here but definitely in the branches you stage for
3.7.

Let me know if you have any questions, or if there's something we
should explain a bit better about how we organize the branches.

> git://git.antcom.de/linux-2.6.git lpc32xx-next

Pulled as lpc32xx/devel and merged into next/soc. You can still use
this branch as a base for more fine-grained topic branches, we should
be able to deal with those dependencies in arm-soc.


Thanks,

-Olof

[GIT PULL]

[Roland Stigge]

Hi Arnd and Olof,

this is the pull request for the 22 patches we discussed last week, still same
commits in the same branch (the 23rd patch was removed from the series, as
discussed on the list).

This time, purely mach-lpc32xx specific patches.

Please tell if sth. is missing, so I can know if I can build upon that. (I'm
already collecting new patches on top of this branch.)

Thanks in advance,

Roland



The following changes since commit cfaf025112d3856637ff34a767ef785ef5cf2ca9:

  Linux 3.5-rc2 (2012-06-08 18:40:09 -0700)

are available in the git repository at:

  git://git.antcom.de/linux-2.6.git lpc32xx-next

for you to fetch changes up to df072717eb0050326f0f63eed98200412c395831:

  ARM: LPC32xx: Move i2s1 dma enabling to clock.c (2012-06-14 16:16:19 +0200)

----------------------------------------------------------------
Alexandre Pereira da Silva (7):
      ARM: LPC32xx: Build arch dtbs
      ARM: LPC32xx: Add dt settings to the at25 node
      ARM: LPC32xx: Remove spi chipselect request from board init
      ARM: LPC32xx: Remove spi chip definitions
      ARM: LPC32xx: Cleanup board init, remove duplicate clock init
      ARM: LPC32xx: Move uart6 irda disable to serial.c
      ARM: LPC32xx: Move i2s1 dma enabling to clock.c

Roland Stigge (15):
      ARM: LPC32xx: Add NAND flash timing to PHY3250 board dts
      ARM: LPC32xx: Clock initialization for NAND controllers
      ARM: LPC32xx: Remove SLC controller initialization from platform init
      ARM: LPC32xx: Add DMA configuration to platform data
      ARM: LPC32xx: Adjust dtsi file for MLC controller configuration
      ARM: LPC32xx: Add dts for EA3250 reference board
      ARM: LPC32xx: DTS adjustment for key matrix controller
      ARM: LPC32xx: Clock adjustment for key matrix controller
      ARM: LPC32xx: Defconfig update
      ARM: LPC32xx: Add MMC controller support
      ARM: LPC32xx: DTS adjustment for using pl18x primecell
      ARM: LPC32xx: DT conversion of Standard UARTs
      ARM: LPC32xx: High Speed UART configuration via DT
      ARM: LPC32xx: Remove mach specific ARCH_NR_GPIOS, use default
      ARM: LPC32xx: Fix lpc32xx.dtsi status property: "disable" -> "disabled"

 arch/arm/Kconfig                          |    2 -
 arch/arm/boot/dts/ea3250.dts              |  157 ++++++++++++++++++++++++++++
 arch/arm/boot/dts/lpc32xx.dtsi            |   74 +++++++++-----
 arch/arm/boot/dts/phy3250.dts             |   61 +++++++++++
 arch/arm/configs/lpc32xx_defconfig        |   24 +++--
 arch/arm/mach-lpc32xx/Kconfig             |   32 ------
 arch/arm/mach-lpc32xx/Makefile.boot       |    1 +
 arch/arm/mach-lpc32xx/clock.c             |   21 +++-
 arch/arm/mach-lpc32xx/include/mach/gpio.h |    2 -
 arch/arm/mach-lpc32xx/phy3250.c           |  158 ++++++++++++-----------------
 arch/arm/mach-lpc32xx/serial.c            |   90 ++--------------
 11 files changed, 376 insertions(+), 246 deletions(-)
 create mode 100644 arch/arm/boot/dts/ea3250.dts
 delete mode 100644 arch/arm/mach-lpc32xx/Kconfig

[git pull]

[Jesse Barnes]

The following changes since commit
4f262acfde22b63498b5e4f165e53d3bb4e96400:

  Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm (2012-03-07 08:33:03 -0800)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci for-linus

A single fix for a regression that affects some people who try to
disable ASPM for whatever reason.

Matthew Garrett (1):
      PCI: ignore pre-1.1 ASPM quirking when ASPM is disabled

 drivers/pci/pcie/aspm.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

[GIT PULL]

[Olof Johansson]

On Mon, Dec 19, 2011 at 3:29 AM, Sascha Hauer <s.hauer@pengutronix.de> wrote:
> Hi Arnd, Olof,
>
> Please pull the following for -rc. Most stuff is regressions since
> the last merge window, so only "ARM:imx:fix pwm period value" has
> Cc stable.
>
> Sascha
>
> The following changes since commit 384703b8e6cd4c8ef08512e596024e028c91c339:
>
> ?Linux 3.2-rc6 (2011-12-16 18:36:26 -0800)
>
> are available in the git repository at:
> ?git://git.pengutronix.de/git/imx/linux-2.6.git fixes-for-arnd

Thanks, pulled.

For the next release cycle, please try to get these kind of fixes in
sooner if you can -- it's getting quite close to release.


-Olof

[GIT PULL]

[Sascha Hauer]

Hi Arnd, Olof,

Please pull the following for -rc. Most stuff is regressions since
the last merge window, so only "ARM:imx:fix pwm period value" has
Cc stable.

Sascha

The following changes since commit 384703b8e6cd4c8ef08512e596024e028c91c339:

  Linux 3.2-rc6 (2011-12-16 18:36:26 -0800)

are available in the git repository at:
  git://git.pengutronix.de/git/imx/linux-2.6.git fixes-for-arnd

Eric B?nard (7):
      cpuimx25sd: fix Kconfig
      imx_v4_v5_defconfig: update default configuration
      dma: MX3_IPU fix depends
      clock-imx35: fix reboot in internal boot mode
      cpuimx35sd: fix Kconfig
      cpuimx35: fix touchscreen support
      enable uncompress log on cpuimx35sd

Jason Chen (1):
      ARM:imx:fix pwm period value

Richard Zhao (1):
      arm/imx: fix cpufreq section mismatch

 arch/arm/configs/imx_v4_v5_defconfig        |   12 +++++++-----
 arch/arm/mach-imx/Kconfig                   |    8 ++++----
 arch/arm/mach-imx/Makefile                  |    4 ++--
 arch/arm/mach-imx/clock-imx35.c             |   20 ++++++++++----------
 arch/arm/mach-imx/mach-cpuimx35.c           |    8 +++++++-
 arch/arm/plat-mxc/cpufreq.c                 |    2 +-
 arch/arm/plat-mxc/include/mach/uncompress.h |    1 +
 arch/arm/plat-mxc/pwm.c                     |    9 +++++++++
 drivers/dma/Kconfig                         |    4 ++--
 9 files changed, 43 insertions(+), 25 deletions(-)
-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

Re: [GIT PULL]

[Ted Ts'o]

On Fri, Feb 11, 2011 at 04:33:59PM -0800, Linus Torvalds wrote:
> This is a completely disgusting patch, and it causes warnings like this:

Mea culpa, mea culpa, mea maximum culpa.  Yes, sorry, I should have
caught the macro expansion bug and the cast warning.

I've fixed up the problems, and repushed the for_linus branch.  My
post -rc1 push came late due to travel and other business, and that no
doubt contributed to the lack of quality control, but I didn't want to
wait since they did fix a number of fairly serious regressions.  I
hope you'll take the pull with these problems fixed?

  git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git for_linus

						- Ted

Curt Wohlgemuth (1):
      ext4: Fix data corruption with multi-block writepages support

Eric Sandeen (3):
      ext4: fix panic on module unload when stopping lazyinit thread
      ext4: make grpinfo slab cache names static
      ext4: serialize unaligned asynchronous DIO

Lukas Czerner (1):
      ext4: unregister features interface on module unload

Theodore Ts'o (2):
      ext4: fix up ext4 error handling
      jbd2: call __jbd2_log_start_commit with j_state_lock write locked

 fs/ext4/ext4.h        |   10 +++++
 fs/ext4/extents.c     |   10 +++--
 fs/ext4/file.c        |   60 +++++++++++++++++++++++++++++-
 fs/ext4/mballoc.c     |  100 +++++++++++++++++++++++++++++-------------------
 fs/ext4/page-io.c     |   36 +++++++++--------
 fs/ext4/super.c       |   66 ++++++++++++++++++++++----------
 fs/jbd2/journal.c     |    9 +++-
 fs/jbd2/transaction.c |   21 +++++++---
 8 files changed, 221 insertions(+), 91 deletions(-)

Re: [GIT PULL]

[Eric Sandeen]

On 2/11/11 6:33 PM, Linus Torvalds wrote:
> On Fri, Feb 11, 2011 at 5:40 AM, Ted Ts'o <tytso@mit.edu> wrote:
>>
>> Please pull from:
>>
>>  git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git for_linus
>>
>> to get regression and bug fixes for 2.6.38.
>>
>> Eric Sandeen (3):
>>      ext4: serialize unaligned asynchronous DIO
> 
> This is a completely disgusting patch, and it causes warnings like this:

>  fs/ext4/file.c: In function ‘ext4_aiodio_wait’:
>  fs/ext4/file.c:60:44: warning: cast from pointer to integer of different size
> 
> because that disgusting patch does things like
> 
>   #define ext4_aio_mutex(v)  (&ext4__aio_mutex[((unsigned)v) % EXT4_WQ_HASH_SZ])

Well crap, the patch I sent Ted did not cause warnings.
OTOH, I eyeballed his changes to my patch and said OK.  Didn't test-build it though.
Sorry about that.

Will see what's going on here...

-Eric

> which is just terminally broken.
> 
> It's terminally broken for multiple reasons, too. It's not just "oh, a
> warning". It's a case of "oh, THAT CODE IS UTTER CRAP". The warning
> was just the lucky reason I noticed the totally unacceptable code.
> 
> Dammit, don't send sh*t to me this late in the release cycle. This
> clearly went through _zero_ quality control.
> 
>                    Linus
> 
> PS. If people don't understand why that code is utter crap, let me
> give you a hint: macro argument expansion vs operator precedence.
> 
> PPS. And btw, the warning is unacceptable too. Cast the thing to
> "unsigned long" (or uintptr_t, but quite frankly, in the kernel I'd
> suggest "unsigned long" rather than the more obscure standard types)
> after you've fixed the macro argument problem.
> --
> To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [GIT PULL]

[Eric Sandeen]

On 2/11/11 6:33 PM, Linus Torvalds wrote:
> On Fri, Feb 11, 2011 at 5:40 AM, Ted Ts'o <tytso@mit.edu> wrote:
>>
>> Please pull from:
>>
>>  git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git for_linus
>>
>> to get regression and bug fixes for 2.6.38.
>>
>> Eric Sandeen (3):
>>      ext4: serialize unaligned asynchronous DIO
> 
> This is a completely disgusting patch, and it causes warnings like this:

>  fs/ext4/file.c: In function ‘ext4_aiodio_wait’:
>  fs/ext4/file.c:60:44: warning: cast from pointer to integer of different size
> 
> because that disgusting patch does things like
> 
>   #define ext4_aio_mutex(v)  (&ext4__aio_mutex[((unsigned)v) % EXT4_WQ_HASH_SZ])

Well crap, the patch I sent Ted did not cause warnings.
OTOH, I eyeballed his changes to my patch and said OK.  Didn't test-build it though.
Sorry about that.

Will see what's going on here...

-Eric

> which is just terminally broken.
> 
> It's terminally broken for multiple reasons, too. It's not just "oh, a
> warning". It's a case of "oh, THAT CODE IS UTTER CRAP". The warning
> was just the lucky reason I noticed the totally unacceptable code.
> 
> Dammit, don't send sh*t to me this late in the release cycle. This
> clearly went through _zero_ quality control.
> 
>                    Linus
> 
> PS. If people don't understand why that code is utter crap, let me
> give you a hint: macro argument expansion vs operator precedence.
> 
> PPS. And btw, the warning is unacceptable too. Cast the thing to
> "unsigned long" (or uintptr_t, but quite frankly, in the kernel I'd
> suggest "unsigned long" rather than the more obscure standard types)
> after you've fixed the macro argument problem.
> --
> To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [GIT PULL]

[Linus Torvalds]

On Fri, Feb 11, 2011 at 5:40 AM, Ted Ts'o <tytso@mit.edu> wrote:
>
> Please pull from:
>
>  git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git for_linus
>
> to get regression and bug fixes for 2.6.38.
>
> Eric Sandeen (3):
>      ext4: serialize unaligned asynchronous DIO

This is a completely disgusting patch, and it causes warnings like this:

 fs/ext4/file.c: In function ‘ext4_aiodio_wait’:
 fs/ext4/file.c:60:44: warning: cast from pointer to integer of different size

because that disgusting patch does things like

  #define ext4_aio_mutex(v)  (&ext4__aio_mutex[((unsigned)v) % EXT4_WQ_HASH_SZ])

which is just terminally broken.

It's terminally broken for multiple reasons, too. It's not just "oh, a
warning". It's a case of "oh, THAT CODE IS UTTER CRAP". The warning
was just the lucky reason I noticed the totally unacceptable code.

Dammit, don't send sh*t to me this late in the release cycle. This
clearly went through _zero_ quality control.

                   Linus

PS. If people don't understand why that code is utter crap, let me
give you a hint: macro argument expansion vs operator precedence.

PPS. And btw, the warning is unacceptable too. Cast the thing to
"unsigned long" (or uintptr_t, but quite frankly, in the kernel I'd
suggest "unsigned long" rather than the more obscure standard types)
after you've fixed the macro argument problem.

Re: [GIT PULL]

[Linus Torvalds]

On Fri, Feb 11, 2011 at 5:40 AM, Ted Ts'o <tytso@mit.edu> wrote:
>
> Please pull from:
>
>  git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git for_linus
>
> to get regression and bug fixes for 2.6.38.
>
> Eric Sandeen (3):
>      ext4: serialize unaligned asynchronous DIO

This is a completely disgusting patch, and it causes warnings like this:

 fs/ext4/file.c: In function ‘ext4_aiodio_wait’:
 fs/ext4/file.c:60:44: warning: cast from pointer to integer of different size

because that disgusting patch does things like

  #define ext4_aio_mutex(v)  (&ext4__aio_mutex[((unsigned)v) % EXT4_WQ_HASH_SZ])

which is just terminally broken.

It's terminally broken for multiple reasons, too. It's not just "oh, a
warning". It's a case of "oh, THAT CODE IS UTTER CRAP". The warning
was just the lucky reason I noticed the totally unacceptable code.

Dammit, don't send sh*t to me this late in the release cycle. This
clearly went through _zero_ quality control.

                   Linus

PS. If people don't understand why that code is utter crap, let me
give you a hint: macro argument expansion vs operator precedence.

PPS. And btw, the warning is unacceptable too. Cast the thing to
"unsigned long" (or uintptr_t, but quite frankly, in the kernel I'd
suggest "unsigned long" rather than the more obscure standard types)
after you've fixed the macro argument problem.
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[GIT PULL]

[Ted Ts'o]

Hi Linus,

Please pull from:

  git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git for_linus

to get regression and bug fixes for 2.6.38.

Thanks,

	       	  	     	      	  - Ted

Curt Wohlgemuth (1):
      ext4: Fix data corruption with multi-block writepages support

Dan Carpenter (1):
      ext4: off by one check in ext4_groupinfo_create_slab()

Eric Sandeen (3):
      ext4: fix panic on module unload when stopping lazyinit thread
      ext4: make grpinfo slab cache names static
      ext4: serialize unaligned asynchronous DIO

Lukas Czerner (1):
      ext4: unregister features interface on module unload

Theodore Ts'o (2):
      ext4: fix up ext4 error handling
      jbd2: call __jbd2_log_start_commit with j_state_lock write locked

 fs/ext4/ext4.h        |    8 ++++
 fs/ext4/extents.c     |   10 +++--
 fs/ext4/file.c        |   60 +++++++++++++++++++++++++++++-
 fs/ext4/mballoc.c     |  100 +++++++++++++++++++++++++++++-------------------
 fs/ext4/page-io.c     |   36 +++++++++--------
 fs/ext4/super.c       |   66 ++++++++++++++++++++++----------
 fs/jbd2/journal.c     |    9 +++-
 fs/jbd2/transaction.c |   21 +++++++---
 8 files changed, 219 insertions(+), 91 deletions(-)

Re: [GIT PULL]

[Jean-Christophe PLAGNIOL-VILLARD]

On 14:52 Fri 10 Sep     , Nicolas Ferre wrote:
> Hi Linus,
> 
> Can you please pull ARM/AT91 little fixes from:
Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>

Best Regards,
J.

[GIT PULL]

[Jean-Christophe PLAGNIOL-VILLARD]

On 14:52 Fri 10 Sep     , Nicolas Ferre wrote:
> Hi Linus,
> 
> Can you please pull ARM/AT91 little fixes from:
Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>

Best Regards,
J.

[GIT PULL]

[Nicolas Ferre]

Hi Linus,

Can you please pull ARM/AT91 little fixes from:

  git://github.com/at91linux/linux-2.6-at91.git at91-fixes-for-linus

and receive the following changes:

Fabian Godehardt (1):
      AT91: SAM9G45 - add a separate clock entry for every single TC block

Nicolas Ferre (5):
      AT91: change dma resource index
      AT91: clock: peripheral clocks can have other parent than mck
      AT91: dm9000 initialization update
      AT91: at91sam9261ek board: remove warnings related to use of SPI or SD/MMC
      AT91: at91sam9261ek: remove C99 comments but keep information

 arch/arm/mach-at91/at91sam9g45.c         |   15 +++++++++++--
 arch/arm/mach-at91/at91sam9g45_devices.c |    6 ++--
 arch/arm/mach-at91/board-sam9261ek.c     |   31 ++++++++++++++++++-----------
 arch/arm/mach-at91/clock.c               |    3 +-
 4 files changed, 36 insertions(+), 19 deletions(-)

Thanks,
-- 
Nicolas Ferre

[GIT PULL]

[Nicolas Ferre]

Hi Linus,

Can you please pull ARM/AT91 little fixes from:

  git://github.com/at91linux/linux-2.6-at91.git at91-fixes-for-linus

and receive the following changes:

Fabian Godehardt (1):
      AT91: SAM9G45 - add a separate clock entry for every single TC block

Nicolas Ferre (5):
      AT91: change dma resource index
      AT91: clock: peripheral clocks can have other parent than mck
      AT91: dm9000 initialization update
      AT91: at91sam9261ek board: remove warnings related to use of SPI or SD/MMC
      AT91: at91sam9261ek: remove C99 comments but keep information

 arch/arm/mach-at91/at91sam9g45.c         |   15 +++++++++++--
 arch/arm/mach-at91/at91sam9g45_devices.c |    6 ++--
 arch/arm/mach-at91/board-sam9261ek.c     |   31 ++++++++++++++++++-----------
 arch/arm/mach-at91/clock.c               |    3 +-
 4 files changed, 36 insertions(+), 19 deletions(-)

Thanks,
-- 
Nicolas Ferre

[GIT PULL]

[Frederic Weisbecker]

Ingo,

Please pull the perf/urgent branch that can be found at:

git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing.git
	perf/urgent

Thanks,
	Frederic
---

Frederic Weisbecker (1):
      x86/stacktrace: Don't dereference bad frame pointers


 arch/x86/kernel/dumpstack_64.c |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

---
commit 29044ad1509ecc229f1d5a31aeed7a8dc61a71c4
Author: Frederic Weisbecker <fweisbec@gmail.com>
Date:   Wed Mar 3 02:25:22 2010 +0100

    x86/stacktrace: Don't dereference bad frame pointers
    
    Callers of a stacktrace might pass bad frame pointers. Those
    are usually checked for safety in stack walking helpers before
    any dereferencing, but this is not the case when we need to go
    through one more frame pointer that backlinks the irq stack to
    the previous one, as we don't have any reliable address boudaries
    to compare this frame pointer against.
    
    This raises crashes when we record callchains for ftrace events
    with perf because we don't use the right helpers to capture
    registers there. We get wrong frame pointers as we call
    task_pt_regs() even on kernel threads, which is a wrong thing
    as it gives us the initial state of any kernel threads freshly
    created. This is even not what we want for user tasks. What we want
    is a hot snapshot of registers when the ftrace event triggers, not
    the state before a task entered the kernel.
    
    This requires more thoughts to do it correctly though.
    So first put a guardian to ensure the given frame pointer
    can be dereferenced to avoid crashes. We'll think about how to fix
    the callers in a subsequent patch.
    
    Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
    Cc: Ingo Molnar <mingo@elte.hu>
    Cc: Thomas Gleixner <tglx@linutronix.de>
    Cc: H. Peter Anvin <hpa@zytor.com>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Cc: Paul Mackerras <paulus@samba.org>
    Cc: Steven Rostedt <rostedt@goodmis.org>
    Cc: 2.6.33.x <stable@kernel.org>
    Cc: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/arch/x86/kernel/dumpstack_64.c b/arch/x86/kernel/dumpstack_64.c
index 0ad9597..a6c906c 100644
--- a/arch/x86/kernel/dumpstack_64.c
+++ b/arch/x86/kernel/dumpstack_64.c
@@ -125,9 +125,15 @@ fixup_bp_irq_link(unsigned long bp, unsigned long *stack,
 {
 #ifdef CONFIG_FRAME_POINTER
 	struct stack_frame *frame = (struct stack_frame *)bp;
+	unsigned long next;
 
-	if (!in_irq_stack(stack, irq_stack, irq_stack_end))
-		return (unsigned long)frame->next_frame;
+	if (!in_irq_stack(stack, irq_stack, irq_stack_end)) {
+		if (!probe_kernel_address(&frame->next_frame, next))
+			return next;
+		else
+			WARN_ONCE(1, "Perf: bad frame pointer = %p in "
+				  "callchain\n", &frame->next_frame);
+	}
 #endif
 	return bp;
 }

[GIT PULL]

[Haavard Skinnemoen]

Linus,

Please pull from

  ssh://master.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6.git for-linus

to receive the following updates. This is mostly about connecting a few
loose ends that came in through other trees, that is make sure that the
new drivers can actually be used on avr32.

Alejandro Martinez Ruiz (1):
      [AVR32] ARRAY_SIZE() cleanup

Haavard Skinnemoen (3):
      [AVR32] Fix a couple of sparse warnings
      [AVR32] Implement more at32_add_device_foo() functions
      [AVR32] Implement at32_add_device_cf()

Hans-Christian Egtvedt (1):
      [AVR32] Wire up AT73C213 sound driver on ATSTK1000 board

Kristoffer Nyborg Gregertsen (1):
      [AVR32] Platform code for pata_at32

 arch/avr32/boards/atstk1000/atstk1002.c |   58 +++++
 arch/avr32/mach-at32ap/at32ap7000.c     |  344 +++++++++++++++++++++++++++++++
 arch/avr32/mach-at32ap/extint.c         |    2 +-
 arch/avr32/mach-at32ap/pm.h             |    4 +-
 arch/avr32/mach-at32ap/time-tc.c        |    2 +-
 include/asm-avr32/arch-at32ap/board.h   |   23 ++
 6 files changed, 429 insertions(+), 4 deletions(-)

diff --git a/arch/avr32/boards/atstk1000/atstk1002.c b/arch/avr32/boards/atstk1000/atstk1002.c
index 6b9e466..5be0d13 100644
--- a/arch/avr32/boards/atstk1000/atstk1002.c
+++ b/arch/avr32/boards/atstk1000/atstk1002.c
@@ -16,6 +16,7 @@
 #include <linux/string.h>
 #include <linux/types.h>
 #include <linux/spi/spi.h>
+#include <linux/spi/at73c213.h>
 
 #include <video/atmel_lcdc.h>
 
@@ -49,7 +50,26 @@ static struct eth_platform_data __initdata eth_data[2] = {
 };
 
 #ifndef CONFIG_BOARD_ATSTK1002_SW1_CUSTOM
+#ifndef CONFIG_BOARD_ATSTK1002_SW3_CUSTOM
+static struct at73c213_board_info at73c213_data = {
+	.ssc_id		= 0,
+	.shortname	= "AVR32 STK1000 external DAC",
+};
+#endif
+#endif
+
+#ifndef CONFIG_BOARD_ATSTK1002_SW1_CUSTOM
 static struct spi_board_info spi0_board_info[] __initdata = {
+#ifndef CONFIG_BOARD_ATSTK1002_SW3_CUSTOM
+	{
+		/* AT73C213 */
+		.modalias	= "at73c213",
+		.max_speed_hz	= 200000,
+		.chip_select	= 0,
+		.mode		= SPI_MODE_1,
+		.platform_data	= &at73c213_data,
+	},
+#endif
 	{
 		/* QVGA display */
 		.modalias	= "ltv350qv",
@@ -180,6 +200,38 @@ static void setup_j2_leds(void)
 }
 #endif
 
+#ifndef CONFIG_BOARD_ATSTK1002_SW1_CUSTOM
+#ifndef CONFIG_BOARD_ATSTK1002_SW3_CUSTOM
+static void __init at73c213_set_clk(struct at73c213_board_info *info)
+{
+	struct clk *gclk;
+	struct clk *pll;
+
+	gclk = clk_get(NULL, "gclk0");
+	if (IS_ERR(gclk))
+		goto err_gclk;
+	pll = clk_get(NULL, "pll0");
+	if (IS_ERR(pll))
+		goto err_pll;
+
+	if (clk_set_parent(gclk, pll)) {
+		pr_debug("STK1000: failed to set pll0 as parent for DAC clock\n");
+		goto err_set_clk;
+	}
+
+	at32_select_periph(GPIO_PIN_PA(30), GPIO_PERIPH_A, 0);
+	info->dac_clk = gclk;
+
+err_set_clk:
+	clk_put(pll);
+err_pll:
+	clk_put(gclk);
+err_gclk:
+	return;
+}
+#endif
+#endif
+
 void __init setup_board(void)
 {
 #ifdef	CONFIG_BOARD_ATSTK1002_SW2_CUSTOM
@@ -248,6 +300,12 @@ static int __init atstk1002_init(void)
 
 	setup_j2_leds();
 
+#ifndef CONFIG_BOARD_ATSTK1002_SW3_CUSTOM
+#ifndef CONFIG_BOARD_ATSTK1002_SW1_CUSTOM
+	at73c213_set_clk(&at73c213_data);
+#endif
+#endif
+
 	return 0;
 }
 postcore_initcall(atstk1002_init);
diff --git a/arch/avr32/mach-at32ap/at32ap7000.c b/arch/avr32/mach-at32ap/at32ap7000.c
index f6d154c..a9d9ec0 100644
--- a/arch/avr32/mach-at32ap/at32ap7000.c
+++ b/arch/avr32/mach-at32ap/at32ap7000.c
@@ -556,6 +556,17 @@ static struct clk pico_clk = {
 	.users		= 1,
 };
 
+static struct resource dmaca0_resource[] = {
+	{
+		.start	= 0xff200000,
+		.end	= 0xff20ffff,
+		.flags	= IORESOURCE_MEM,
+	},
+	IRQ(2),
+};
+DEFINE_DEV(dmaca, 0);
+DEV_CLK(hclk, dmaca0, hsb, 10);
+
 /* --------------------------------------------------------------------
  * HMATRIX
  * -------------------------------------------------------------------- */
@@ -655,6 +666,7 @@ void __init at32_add_system_devices(void)
 	platform_device_register(&at32_eic0_device);
 	platform_device_register(&smc0_device);
 	platform_device_register(&pdc_device);
+	platform_device_register(&dmaca0_device);
 
 	platform_device_register(&at32_systc0_device);
 
@@ -960,6 +972,96 @@ at32_add_device_spi(unsigned int id, struct spi_board_info *b, unsigned int n)
 }
 
 /* --------------------------------------------------------------------
+ *  TWI
+ * -------------------------------------------------------------------- */
+static struct resource atmel_twi0_resource[] __initdata = {
+	PBMEM(0xffe00800),
+	IRQ(5),
+};
+static struct clk atmel_twi0_pclk = {
+	.name		= "twi_pclk",
+	.parent		= &pba_clk,
+	.mode		= pba_clk_mode,
+	.get_rate	= pba_clk_get_rate,
+	.index		= 2,
+};
+
+struct platform_device *__init at32_add_device_twi(unsigned int id)
+{
+	struct platform_device *pdev;
+
+	if (id != 0)
+		return NULL;
+
+	pdev = platform_device_alloc("atmel_twi", id);
+	if (!pdev)
+		return NULL;
+
+	if (platform_device_add_resources(pdev, atmel_twi0_resource,
+				ARRAY_SIZE(atmel_twi0_resource)))
+		goto err_add_resources;
+
+	select_peripheral(PA(6),  PERIPH_A, 0);	/* SDA	*/
+	select_peripheral(PA(7),  PERIPH_A, 0);	/* SDL	*/
+
+	atmel_twi0_pclk.dev = &pdev->dev;
+
+	platform_device_add(pdev);
+	return pdev;
+
+err_add_resources:
+	platform_device_put(pdev);
+	return NULL;
+}
+
+/* --------------------------------------------------------------------
+ * MMC
+ * -------------------------------------------------------------------- */
+static struct resource atmel_mci0_resource[] __initdata = {
+	PBMEM(0xfff02400),
+	IRQ(28),
+};
+static struct clk atmel_mci0_pclk = {
+	.name		= "mci_clk",
+	.parent		= &pbb_clk,
+	.mode		= pbb_clk_mode,
+	.get_rate	= pbb_clk_get_rate,
+	.index		= 9,
+};
+
+struct platform_device *__init at32_add_device_mci(unsigned int id)
+{
+	struct platform_device *pdev;
+
+	if (id != 0)
+		return NULL;
+
+	pdev = platform_device_alloc("atmel_mci", id);
+	if (!pdev)
+		return NULL;
+
+	if (platform_device_add_resources(pdev, atmel_mci0_resource,
+				ARRAY_SIZE(atmel_mci0_resource)))
+		goto err_add_resources;
+
+	select_peripheral(PA(10), PERIPH_A, 0);	/* CLK	 */
+	select_peripheral(PA(11), PERIPH_A, 0);	/* CMD	 */
+	select_peripheral(PA(12), PERIPH_A, 0);	/* DATA0 */
+	select_peripheral(PA(13), PERIPH_A, 0);	/* DATA1 */
+	select_peripheral(PA(14), PERIPH_A, 0);	/* DATA2 */
+	select_peripheral(PA(15), PERIPH_A, 0);	/* DATA3 */
+
+	atmel_mci0_pclk.dev = &pdev->dev;
+
+	platform_device_add(pdev);
+	return pdev;
+
+err_add_resources:
+	platform_device_put(pdev);
+	return NULL;
+}
+
+/* --------------------------------------------------------------------
  *  LCDC
  * -------------------------------------------------------------------- */
 static struct atmel_lcdfb_info atmel_lcdfb0_data;
@@ -1228,6 +1330,241 @@ out_free_pdev:
 }
 
 /* --------------------------------------------------------------------
+ * IDE / CompactFlash
+ * -------------------------------------------------------------------- */
+static struct resource at32_smc_cs4_resource[] __initdata = {
+	{
+		.start	= 0x04000000,
+		.end	= 0x07ffffff,
+		.flags	= IORESOURCE_MEM,
+	},
+	IRQ(~0UL), /* Magic IRQ will be overridden */
+};
+static struct resource at32_smc_cs5_resource[] __initdata = {
+	{
+		.start	= 0x20000000,
+		.end	= 0x23ffffff,
+		.flags	= IORESOURCE_MEM,
+	},
+	IRQ(~0UL), /* Magic IRQ will be overridden */
+};
+
+static int __init at32_init_ide_or_cf(struct platform_device *pdev,
+		unsigned int cs, unsigned int extint)
+{
+	static unsigned int extint_pin_map[4] __initdata = {
+		GPIO_PIN_PB(25),
+		GPIO_PIN_PB(26),
+		GPIO_PIN_PB(27),
+		GPIO_PIN_PB(28),
+	};
+	static bool common_pins_initialized __initdata = false;
+	unsigned int extint_pin;
+	int ret;
+
+	if (extint >= ARRAY_SIZE(extint_pin_map))
+		return -EINVAL;
+	extint_pin = extint_pin_map[extint];
+
+	switch (cs) {
+	case 4:
+		ret = platform_device_add_resources(pdev,
+				at32_smc_cs4_resource,
+				ARRAY_SIZE(at32_smc_cs4_resource));
+		if (ret)
+			return ret;
+
+		select_peripheral(PE(21), PERIPH_A, 0); /* NCS4   -> OE_N  */
+		set_ebi_sfr_bits(HMATRIX_BIT(CS4A));
+		break;
+	case 5:
+		ret = platform_device_add_resources(pdev,
+				at32_smc_cs5_resource,
+				ARRAY_SIZE(at32_smc_cs5_resource));
+		if (ret)
+			return ret;
+
+		select_peripheral(PE(22), PERIPH_A, 0); /* NCS5   -> OE_N  */
+		set_ebi_sfr_bits(HMATRIX_BIT(CS5A));
+		break;
+	default:
+		return -EINVAL;
+	}
+
+	if (!common_pins_initialized) {
+		select_peripheral(PE(19), PERIPH_A, 0);	/* CFCE1  -> CS0_N */
+		select_peripheral(PE(20), PERIPH_A, 0);	/* CFCE2  -> CS1_N */
+		select_peripheral(PE(23), PERIPH_A, 0); /* CFRNW  -> DIR   */
+		select_peripheral(PE(24), PERIPH_A, 0); /* NWAIT  <- IORDY */
+		common_pins_initialized = true;
+	}
+
+	at32_select_periph(extint_pin, GPIO_PERIPH_A, AT32_GPIOF_DEGLITCH);
+
+	pdev->resource[1].start = EIM_IRQ_BASE + extint;
+	pdev->resource[1].end = pdev->resource[1].start;
+
+	return 0;
+}
+
+struct platform_device *__init
+at32_add_device_ide(unsigned int id, unsigned int extint,
+		    struct ide_platform_data *data)
+{
+	struct platform_device *pdev;
+
+	pdev = platform_device_alloc("at32_ide", id);
+	if (!pdev)
+		goto fail;
+
+	if (platform_device_add_data(pdev, data,
+				sizeof(struct ide_platform_data)))
+		goto fail;
+
+	if (at32_init_ide_or_cf(pdev, data->cs, extint))
+		goto fail;
+
+	platform_device_add(pdev);
+	return pdev;
+
+fail:
+	platform_device_put(pdev);
+	return NULL;
+}
+
+struct platform_device *__init
+at32_add_device_cf(unsigned int id, unsigned int extint,
+		    struct cf_platform_data *data)
+{
+	struct platform_device *pdev;
+
+	pdev = platform_device_alloc("at32_cf", id);
+	if (!pdev)
+		goto fail;
+
+	if (platform_device_add_data(pdev, data,
+				sizeof(struct cf_platform_data)))
+		goto fail;
+
+	if (at32_init_ide_or_cf(pdev, data->cs, extint))
+		goto fail;
+
+	if (data->detect_pin != GPIO_PIN_NONE)
+		at32_select_gpio(data->detect_pin, AT32_GPIOF_DEGLITCH);
+	if (data->reset_pin != GPIO_PIN_NONE)
+		at32_select_gpio(data->reset_pin, 0);
+	if (data->vcc_pin != GPIO_PIN_NONE)
+		at32_select_gpio(data->vcc_pin, 0);
+	/* READY is used as extint, so we can't select it as gpio */
+
+	platform_device_add(pdev);
+	return pdev;
+
+fail:
+	platform_device_put(pdev);
+	return NULL;
+}
+
+/* --------------------------------------------------------------------
+ * AC97C
+ * -------------------------------------------------------------------- */
+static struct resource atmel_ac97c0_resource[] __initdata = {
+	PBMEM(0xfff02800),
+	IRQ(29),
+};
+static struct clk atmel_ac97c0_pclk = {
+	.name		= "pclk",
+	.parent		= &pbb_clk,
+	.mode		= pbb_clk_mode,
+	.get_rate	= pbb_clk_get_rate,
+	.index		= 10,
+};
+
+struct platform_device *__init at32_add_device_ac97c(unsigned int id)
+{
+	struct platform_device *pdev;
+
+	if (id != 0)
+		return NULL;
+
+	pdev = platform_device_alloc("atmel_ac97c", id);
+	if (!pdev)
+		return NULL;
+
+	if (platform_device_add_resources(pdev, atmel_ac97c0_resource,
+				ARRAY_SIZE(atmel_ac97c0_resource)))
+		goto err_add_resources;
+
+	select_peripheral(PB(20), PERIPH_B, 0);	/* SYNC	*/
+	select_peripheral(PB(21), PERIPH_B, 0);	/* SDO	*/
+	select_peripheral(PB(22), PERIPH_B, 0);	/* SDI	*/
+	select_peripheral(PB(23), PERIPH_B, 0);	/* SCLK	*/
+
+	atmel_ac97c0_pclk.dev = &pdev->dev;
+
+	platform_device_add(pdev);
+	return pdev;
+
+err_add_resources:
+	platform_device_put(pdev);
+	return NULL;
+}
+
+/* --------------------------------------------------------------------
+ * ABDAC
+ * -------------------------------------------------------------------- */
+static struct resource abdac0_resource[] __initdata = {
+	PBMEM(0xfff02000),
+	IRQ(27),
+};
+static struct clk abdac0_pclk = {
+	.name		= "pclk",
+	.parent		= &pbb_clk,
+	.mode		= pbb_clk_mode,
+	.get_rate	= pbb_clk_get_rate,
+	.index		= 8,
+};
+static struct clk abdac0_sample_clk = {
+	.name		= "sample_clk",
+	.mode		= genclk_mode,
+	.get_rate	= genclk_get_rate,
+	.set_rate	= genclk_set_rate,
+	.set_parent	= genclk_set_parent,
+	.index		= 6,
+};
+
+struct platform_device *__init at32_add_device_abdac(unsigned int id)
+{
+	struct platform_device *pdev;
+
+	if (id != 0)
+		return NULL;
+
+	pdev = platform_device_alloc("abdac", id);
+	if (!pdev)
+		return NULL;
+
+	if (platform_device_add_resources(pdev, abdac0_resource,
+				ARRAY_SIZE(abdac0_resource)))
+		goto err_add_resources;
+
+	select_peripheral(PB(20), PERIPH_A, 0);	/* DATA1	*/
+	select_peripheral(PB(21), PERIPH_A, 0);	/* DATA0	*/
+	select_peripheral(PB(22), PERIPH_A, 0);	/* DATAN1	*/
+	select_peripheral(PB(23), PERIPH_A, 0);	/* DATAN0	*/
+
+	abdac0_pclk.dev = &pdev->dev;
+	abdac0_sample_clk.dev = &pdev->dev;
+
+	platform_device_add(pdev);
+	return pdev;
+
+err_add_resources:
+	platform_device_put(pdev);
+	return NULL;
+}
+
+/* --------------------------------------------------------------------
  *  GCLK
  * -------------------------------------------------------------------- */
 static struct clk gclk0 = {
@@ -1290,6 +1627,7 @@ struct clk *at32_clock_list[] = {
 	&smc0_mck,
 	&pdc_hclk,
 	&pdc_pclk,
+	&dmaca0_hclk,
 	&pico_clk,
 	&pio0_mck,
 	&pio1_mck,
@@ -1307,6 +1645,8 @@ struct clk *at32_clock_list[] = {
 	&macb1_pclk,
 	&atmel_spi0_spi_clk,
 	&atmel_spi1_spi_clk,
+	&atmel_twi0_pclk,
+	&atmel_mci0_pclk,
 	&atmel_lcdfb0_hck1,
 	&atmel_lcdfb0_pixclk,
 	&ssc0_pclk,
@@ -1314,6 +1654,9 @@ struct clk *at32_clock_list[] = {
 	&ssc2_pclk,
 	&usba0_hclk,
 	&usba0_pclk,
+	&atmel_ac97c0_pclk,
+	&abdac0_pclk,
+	&abdac0_sample_clk,
 	&gclk0,
 	&gclk1,
 	&gclk2,
@@ -1355,6 +1698,7 @@ void __init at32_clock_init(void)
 	genclk_init_parent(&gclk3);
 	genclk_init_parent(&gclk4);
 	genclk_init_parent(&atmel_lcdfb0_pixclk);
+	genclk_init_parent(&abdac0_sample_clk);
 
 	/*
 	 * Turn on all clocks that have at least one user already, and
diff --git a/arch/avr32/mach-at32ap/extint.c b/arch/avr32/mach-at32ap/extint.c
index 8acd010..f5bfd4c 100644
--- a/arch/avr32/mach-at32ap/extint.c
+++ b/arch/avr32/mach-at32ap/extint.c
@@ -142,7 +142,7 @@ static int eic_set_irq_type(unsigned int irq, unsigned int flow_type)
 	return ret;
 }
 
-struct irq_chip eic_chip = {
+static struct irq_chip eic_chip = {
 	.name		= "eic",
 	.ack		= eic_ack_irq,
 	.mask		= eic_mask_irq,
diff --git a/arch/avr32/mach-at32ap/pm.h b/arch/avr32/mach-at32ap/pm.h
index 47efd0d..694d521 100644
--- a/arch/avr32/mach-at32ap/pm.h
+++ b/arch/avr32/mach-at32ap/pm.h
@@ -113,8 +113,8 @@
 
 /* Register access macros */
 #define pm_readl(reg)							\
-	__raw_readl((void __iomem *)AT32_PM_BASE + PM_##reg)
+	__raw_readl((void __iomem __force *)AT32_PM_BASE + PM_##reg)
 #define pm_writel(reg,value)						\
-	__raw_writel((value), (void __iomem *)AT32_PM_BASE + PM_##reg)
+	__raw_writel((value), (void __iomem __force *)AT32_PM_BASE + PM_##reg)
 
 #endif /* __ARCH_AVR32_MACH_AT32AP_PM_H__ */
diff --git a/arch/avr32/mach-at32ap/time-tc.c b/arch/avr32/mach-at32ap/time-tc.c
index e3070bd..1026586 100644
--- a/arch/avr32/mach-at32ap/time-tc.c
+++ b/arch/avr32/mach-at32ap/time-tc.c
@@ -79,7 +79,7 @@ static int avr32_timer_calc_div_and_set_jiffies(struct clk *pclk)
 {
 	unsigned int cycles_max = (clocksource_avr32.mask + 1) / 2;
 	unsigned int divs[] = { 4, 8, 16, 32 };
-	int divs_size = sizeof(divs) / sizeof(*divs);
+	int divs_size = ARRAY_SIZE(divs);
 	int i = 0;
 	unsigned long count_hz;
 	unsigned long shift;
diff --git a/include/asm-avr32/arch-at32ap/board.h b/include/asm-avr32/arch-at32ap/board.h
index 7dbd603..d6993a6 100644
--- a/include/asm-avr32/arch-at32ap/board.h
+++ b/include/asm-avr32/arch-at32ap/board.h
@@ -44,6 +44,13 @@ struct usba_platform_data {
 struct platform_device *
 at32_add_device_usba(unsigned int id, struct usba_platform_data *data);
 
+struct ide_platform_data {
+	u8      cs;
+};
+struct platform_device *
+at32_add_device_ide(unsigned int id, unsigned int extint,
+		    struct ide_platform_data *data);
+
 /* depending on what's hooked up, not all SSC pins will be used */
 #define	ATMEL_SSC_TK		0x01
 #define	ATMEL_SSC_TF		0x02
@@ -58,4 +65,20 @@ at32_add_device_usba(unsigned int id, struct usba_platform_data *data);
 struct platform_device *
 at32_add_device_ssc(unsigned int id, unsigned int flags);
 
+struct platform_device *at32_add_device_twi(unsigned int id);
+struct platform_device *at32_add_device_mci(unsigned int id);
+struct platform_device *at32_add_device_ac97c(unsigned int id);
+struct platform_device *at32_add_device_abdac(unsigned int id);
+
+struct cf_platform_data {
+	int	detect_pin;
+	int	reset_pin;
+	int	vcc_pin;
+	int	ready_pin;
+	u8	cs;
+};
+struct platform_device *
+at32_add_device_cf(unsigned int id, unsigned int extint,
+		struct cf_platform_data *data);
+
 #endif /* __ASM_ARCH_BOARD_H */