diff options
| author | Mathieu Desnoyers <[email protected]> | 2008-02-02 15:10:32 -0500 |
|---|---|---|
| committer | Sam Ravnborg <[email protected]> | 2008-02-03 08:58:07 +0100 |
| commit | c0ffa3a951668734a635cd1e26bf7583795854c5 (patch) | |
| tree | 5fc4f5de59a09edb24d69f563e8b74d2cdc6d6b4 /net/unix/sysctl_net_unix.c | |
| parent | 603d49885e023d1f68c627c2a2db599fb40eefec (diff) | |
Fix ARM to play nicely with generic Instrumentation menu
The conflicting commit for
move-kconfiginstrumentation-to-arch-kconfig-and-init-kconfig.patch
is the ARM fix from Linus :
commit 38ad9aebe70dc72df08851bbd1620d89329129ba
He just seemed to agree that my approach (just putting the missing ARM
config options in arch/arm/Kconfig) works too. The main advantage it has
is that it is smaller, does not need a cleanup in the future and does
not break the following patches unnecessarily.
It's just been discussed here
http://lkml.org/lkml/2008/1/15/267
However, Linus might prefer to stay with his own patch and I would
totally understand it that late in the release cycle. Therefore I submit
this for the next release cycle.
Signed-off-by: Mathieu Desnoyers <[email protected]>
Cc: Jeff Dike <[email protected]>
Cc: David Howells <[email protected]>
Cc: Ananth N Mavinakayanahalli <[email protected]>
CC: Russell King <[email protected]>
Signed-off-by: Sam Ravnborg <[email protected]>
Diffstat (limited to 'net/unix/sysctl_net_unix.c')
0 files changed, 0 insertions, 0 deletions