* linux-next: build failure after merge of the sound-asoc tree
From: Stephen Rothwell @ 2012-06-05 1:25 UTC (permalink / raw)
To: Mark Brown, Liam Girdwood
Cc: linux-next, linux-kernel, M R Swami Reddy, Vishwas A Deshpande
[-- Attachment #1: Type: text/plain, Size: 490 bytes --]
Hi all,
After merging the sound-asoc tree, today's linux-next build (x86_64
allmodconfig) failed like this:
make[4]: *** No rule to make target `sound/soc/codecs/snd-soc-isabelle.c', needed by `sound/soc/codecs/snd-soc-isabelle.o'. Stop.
Caused by commit 4567db1722aa ("ASoC: Support TI Isabelle Audio
driver"). Was this ever built?
I have used the sound-asoc tree from next-20120601 again for today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: time to clean up your trees
From: Stephen Rothwell @ 2012-06-05 0:58 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 401 bytes --]
Hi all,
Now that the merge window has closed, please clean up your linux-next
included) trees to reflect what is actually in Linus' tree. This
especially applies to those who rebased/rewrote their trees before asking
Linus to merge them (and the quilt series).
If you have already done that, then you have my thanks.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: linux-next: Tree for Apr 12
From: Eric Paris @ 2012-06-04 22:46 UTC (permalink / raw)
To: Andrew Morton
Cc: Stephen Rothwell, linux-next, LKML, netdev, James Morris,
Stephen Smalley
In-Reply-To: <20120604150455.7a80b311.akpm@linux-foundation.org>
On Mon, 2012-06-04 at 15:04 -0700, Andrew Morton wrote:
> On Thu, 12 Apr 2012 14:24:15 -0700
> Andrew Morton <akpm@linux-foundation.org> wrote:
>
> > On Thu, 12 Apr 2012 14:59:31 +1000
> > Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > > I have created today's linux-next tree at
> > > git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
> >
> > This isn't working for me. Some time between April 3 and April 12
> > someone merged something into the non-mm part of linux-next which broke
> > ssh.
> >
> > I boot the box and everything seems to come up OK, but attemtps to ssh
> > into the machine fail with
> >
> > X11 forwarding request failed on channel 0
> > Last login: Thu Apr 12 13:04:35 2012 from akpm.corp.google.com
> > Connection to akpm2 closed.
> >
> > I took a peek in the `strace ssh' output.
> >
> > Good:
> >
> > 17815 write(5, "Last login: Thu Apr 12 13:27:23 "..., 65) = 65
> > 17815 select(7, [3 4], [], NULL, {120, 0}) = 1 (in [3], left {119, 770798})
> > 17815 read(3, "\21O\200\366Mv\343\222\332\251\2403L\376Y18\2047\336\244\226p-+X\2%\2119\314\255"..., 8192) = 80
> > 17815 select(7, [3 4], [5], NULL, {120, 0}) = 1 (out [5], left {119, 999987})
> > 17815 write(5, "\r\33[m\17\33[27m\33[24m\33[Jakpm2:/home/ak"..., 39) = 39
> > 17815 select(7, [3 4], [], NULL, {120, 0}) = 1 (in [4], left {118, 801111})
> > 17815 read(4, "\4", 16384) = 1
> > 17815 select(7, [3 4], [3], NULL, {120, 0}) = 1 (out [3], left {119, 999991})
> > 17815 write(3, "\235J\5\340\234\21\266\207\26e\362\327\2\332\1\267\272\200\364\267?/\320L\341\35\350{+M:\222"..., 48) = 48
> >
> >
> > Bad:
> >
> > 9305 write(5, "Last login: Thu Apr 12 13:02:54 "..., 65) = 65
> > 9305 select(7, [3 4], [], NULL, {120, 0}) = 1 (in [3], left {119, 945541})
> > 9305 read(3, "f\357\250~\260i\2259\320\3258\262)O\364;_\251\360-\314\31\374]\326\300\356\364\370S\3105"..., 8192) = 128
> > 9305 close(5) = 0
> > 9305 close(4) = 0
> >
> > That read() is returning a lot more data.
> >
> > It appears that we've done something which breaks X forwarding. I
> > won't be able to look any further into this until Monday.
>
> This regression is now in mainline. I've bisected it to an SELinux
> patch, below. I have confirmed that reverting just that patch from
> current mainline fixes the regression.
>
> Using openssh-server-4.3p2-14.fc6 on FC6.
>
>
> commit 95dbf739313f09c8d859bde1373bc264ef979337
> Author: Eric Paris <eparis@redhat.com>
> AuthorDate: Wed Apr 4 13:45:34 2012 -0400
> Commit: Eric Paris <eparis@redhat.com>
> CommitDate: Mon Apr 9 12:22:49 2012 -0400
>
> SELinux: check OPEN on truncate calls
>
> In RH BZ 578841 we realized that the SELinux sandbox program was allowed to
> truncate files outside of the sandbox. The reason is because sandbox
> confinement is determined almost entirely by the 'open' permission. The idea
> was that if the sandbox was unable to open() files it would be unable to do
> harm to those files. This turns out to be false in light of syscalls like
> truncate() and chmod() which don't require a previous open() call. I looked
> at the syscalls that did not have an associated 'open' check and found that
> truncate(), did not have a seperate permission and even if it did have a
> separate permission such a permission owuld be inadequate for use by
> sandbox (since it owuld have to be granted so liberally as to be useless).
> This patch checks the OPEN permission on truncate. I think a better solution
> for sandbox is a whole new permission, but at least this fixes what we have
> today.
>
> Signed-off-by: Eric Paris <eparis@redhat.com>
>
> diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
> index d85b793..f7d7e77 100644
> --- a/security/selinux/hooks.c
> +++ b/security/selinux/hooks.c
> @@ -2708,6 +2708,7 @@ static int selinux_inode_setattr(struct dentry *dentry, struct iattr *iattr)
> {
> const struct cred *cred = current_cred();
> unsigned int ia_valid = iattr->ia_valid;
> + __u32 av = FILE__WRITE;
>
> /* ATTR_FORCE is just used for ATTR_KILL_S[UG]ID. */
> if (ia_valid & ATTR_FORCE) {
> @@ -2721,7 +2722,10 @@ static int selinux_inode_setattr(struct dentry *dentry, struct iattr *iattr)
> ATTR_ATIME_SET | ATTR_MTIME_SET | ATTR_TIMES_SET))
> return dentry_has_perm(cred, dentry, FILE__SETATTR);
>
> - return dentry_has_perm(cred, dentry, FILE__WRITE);
> + if (ia_valid & ATTR_SIZE)
> + av |= FILE__OPEN;
> +
> + return dentry_has_perm(cred, dentry, av);
> }
>
> static int selinux_inode_getattr(struct vfsmount *mnt, struct dentry *dentry)
Very odd indeed... I can only assume you are SELinux enforcing and have
a denial every time this fails. Can you send me that denial?
I really do not want to revert this and feel that the only right fix is
going to be to update your selinux policy to allow this new check. I'd
rather not allow (whatever program) to truncate() files willy-nilly (in
violation of the intentions of selinux policy)
I'm sorry I never saw it sooner. We've had it in RHEL for even longer
than the 3 months it's been in -next. I think the 'right' fix is going
to have to be an update to SELinux policy (for your long dead system, if
you give me the denial I can build you a new policy) rather than leaving
the potential security hole in mainline...
-Eric
^ permalink raw reply
* Re: linux-next: Tree for Apr 12
From: Andrew Morton @ 2012-06-04 22:04 UTC (permalink / raw)
To: Stephen Rothwell, linux-next, LKML, netdev, Eric Paris,
James Morris, Stephen Smalley
In-Reply-To: <20120412142415.564710b8.akpm@linux-foundation.org>
On Thu, 12 Apr 2012 14:24:15 -0700
Andrew Morton <akpm@linux-foundation.org> wrote:
> On Thu, 12 Apr 2012 14:59:31 +1000
> Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> > I have created today's linux-next tree at
> > git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
>
> This isn't working for me. Some time between April 3 and April 12
> someone merged something into the non-mm part of linux-next which broke
> ssh.
>
> I boot the box and everything seems to come up OK, but attemtps to ssh
> into the machine fail with
>
> X11 forwarding request failed on channel 0
> Last login: Thu Apr 12 13:04:35 2012 from akpm.corp.google.com
> Connection to akpm2 closed.
>
> I took a peek in the `strace ssh' output.
>
> Good:
>
> 17815 write(5, "Last login: Thu Apr 12 13:27:23 "..., 65) = 65
> 17815 select(7, [3 4], [], NULL, {120, 0}) = 1 (in [3], left {119, 770798})
> 17815 read(3, "\21O\200\366Mv\343\222\332\251\2403L\376Y18\2047\336\244\226p-+X\2%\2119\314\255"..., 8192) = 80
> 17815 select(7, [3 4], [5], NULL, {120, 0}) = 1 (out [5], left {119, 999987})
> 17815 write(5, "\r\33[m\17\33[27m\33[24m\33[Jakpm2:/home/ak"..., 39) = 39
> 17815 select(7, [3 4], [], NULL, {120, 0}) = 1 (in [4], left {118, 801111})
> 17815 read(4, "\4", 16384) = 1
> 17815 select(7, [3 4], [3], NULL, {120, 0}) = 1 (out [3], left {119, 999991})
> 17815 write(3, "\235J\5\340\234\21\266\207\26e\362\327\2\332\1\267\272\200\364\267?/\320L\341\35\350{+M:\222"..., 48) = 48
>
>
> Bad:
>
> 9305 write(5, "Last login: Thu Apr 12 13:02:54 "..., 65) = 65
> 9305 select(7, [3 4], [], NULL, {120, 0}) = 1 (in [3], left {119, 945541})
> 9305 read(3, "f\357\250~\260i\2259\320\3258\262)O\364;_\251\360-\314\31\374]\326\300\356\364\370S\3105"..., 8192) = 128
> 9305 close(5) = 0
> 9305 close(4) = 0
>
> That read() is returning a lot more data.
>
> It appears that we've done something which breaks X forwarding. I
> won't be able to look any further into this until Monday.
This regression is now in mainline. I've bisected it to an SELinux
patch, below. I have confirmed that reverting just that patch from
current mainline fixes the regression.
Using openssh-server-4.3p2-14.fc6 on FC6.
commit 95dbf739313f09c8d859bde1373bc264ef979337
Author: Eric Paris <eparis@redhat.com>
AuthorDate: Wed Apr 4 13:45:34 2012 -0400
Commit: Eric Paris <eparis@redhat.com>
CommitDate: Mon Apr 9 12:22:49 2012 -0400
SELinux: check OPEN on truncate calls
In RH BZ 578841 we realized that the SELinux sandbox program was allowed to
truncate files outside of the sandbox. The reason is because sandbox
confinement is determined almost entirely by the 'open' permission. The idea
was that if the sandbox was unable to open() files it would be unable to do
harm to those files. This turns out to be false in light of syscalls like
truncate() and chmod() which don't require a previous open() call. I looked
at the syscalls that did not have an associated 'open' check and found that
truncate(), did not have a seperate permission and even if it did have a
separate permission such a permission owuld be inadequate for use by
sandbox (since it owuld have to be granted so liberally as to be useless).
This patch checks the OPEN permission on truncate. I think a better solution
for sandbox is a whole new permission, but at least this fixes what we have
today.
Signed-off-by: Eric Paris <eparis@redhat.com>
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index d85b793..f7d7e77 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -2708,6 +2708,7 @@ static int selinux_inode_setattr(struct dentry *dentry, struct iattr *iattr)
{
const struct cred *cred = current_cred();
unsigned int ia_valid = iattr->ia_valid;
+ __u32 av = FILE__WRITE;
/* ATTR_FORCE is just used for ATTR_KILL_S[UG]ID. */
if (ia_valid & ATTR_FORCE) {
@@ -2721,7 +2722,10 @@ static int selinux_inode_setattr(struct dentry *dentry, struct iattr *iattr)
ATTR_ATIME_SET | ATTR_MTIME_SET | ATTR_TIMES_SET))
return dentry_has_perm(cred, dentry, FILE__SETATTR);
- return dentry_has_perm(cred, dentry, FILE__WRITE);
+ if (ia_valid & ATTR_SIZE)
+ av |= FILE__OPEN;
+
+ return dentry_has_perm(cred, dentry, av);
}
static int selinux_inode_getattr(struct vfsmount *mnt, struct dentry *dentry)
^ permalink raw reply related
* Re: [PATCH -next] acpi: fix acpi_bus.h warnings when ACPI is not enabled
From: Randy Dunlap @ 2012-06-04 14:42 UTC (permalink / raw)
To: Len Brown; +Cc: Stephen Rothwell, linux-next, LKML, linux-acpi, Matthew Garrett
In-Reply-To: <4FCC3A4C.2080407@kernel.org>
On 06/03/2012 09:32 PM, Len Brown wrote:
> Hi Randy,
> with your patch applied and CONFIG_ACPI=n, I still get:
>
> include/acpi/acpi_bus.h:445:12: warning: ‘register_acpi_bus_type’ defined but not used [-Wunused-function]
> include/acpi/acpi_bus.h:446:12: warning: ‘unregister_acpi_bus_type’ defined but not used [-Wunused-function]
>
> so I think I prefer the patch below.
Hi Len,
I'd love to see your failing .config file if you have it or can
reproduce it. My patch still works for me.
> thanks,
> Len Brown, Intel Open Source Technology Center
>
> On 05/23/2012 12:14 PM, Randy Dunlap wrote:
>
>> From: Randy Dunlap <rdunlap@xenotime.net>
>>
>> Fix header file warnings when CONFIG_ACPI is not enabled:
>>
>> include/acpi/acpi_bus.h:443:42: warning: 'struct acpi_bus_type' declared inside parameter list
>> include/acpi/acpi_bus.h:443:42: warning: its scope is only this definition or declaration, which is probably not what you want
>> include/acpi/acpi_bus.h:444:44: warning: 'struct acpi_bus_type' declared inside parameter list
>>
>> Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
>> ---
>> include/acpi/acpi_bus.h | 2 ++
>> 1 file changed, 2 insertions(+)
>>
>> --- linux-next-20120523.orig/include/acpi/acpi_bus.h
>> +++ linux-next-20120523/include/acpi/acpi_bus.h
>> @@ -440,6 +440,8 @@ static inline int acpi_pm_device_sleep_w
>>
>> #else /* CONFIG_ACPI */
>>
>> +struct acpi_bus_type;
>> +
>> static int register_acpi_bus_type(struct acpi_bus_type *bus) { return 0; }
>> static int unregister_acpi_bus_type(struct acpi_bus_type *bus) { return 0; }
>>
>
>
> Subject: [PATCH] ACPI: fix acpi_bus.h build warnings when ACPI is not enabled
>
> introduced in Linux-3.5-rc1 by
> 66886d6f8c9bcdee3d7fce5796dcffd6b4bc0b48
> (ACPI: Add stubs for (un)register_acpi_bus_type)
>
> Fix header file warnings when CONFIG_ACPI is not enabled:
>
> include/acpi/acpi_bus.h:443:42: warning: 'struct acpi_bus_type' declared inside parameter list
> include/acpi/acpi_bus.h:443:42: warning: its scope is only this definition or declaration, which is probably not
> include/acpi/acpi_bus.h:444:44: warning: 'struct acpi_bus_type' declared inside parameter list
>
> Signed-off-by: Len Brown <len.brown@intel.com>
> ---
> include/acpi/acpi_bus.h | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
> index b0d6282..9e6e1c6 100644
> --- a/include/acpi/acpi_bus.h
> +++ b/include/acpi/acpi_bus.h
> @@ -440,8 +440,8 @@ static inline int acpi_pm_device_sleep_wake(struct device *dev, bool enable)
>
> #else /* CONFIG_ACPI */
>
> -static int register_acpi_bus_type(struct acpi_bus_type *bus) { return 0; }
> -static int unregister_acpi_bus_type(struct acpi_bus_type *bus) { return 0; }
> +static inline int register_acpi_bus_type(void *bus) { return 0; }
> +static inline int unregister_acpi_bus_type(void *bus) { return 0; }
>
> #endif /* CONFIG_ACPI */
>
--
~Randy
^ permalink raw reply
* Re: linux-next: build failure after merge of the origin tree
From: Paul Mundt @ 2012-06-04 7:39 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Al Viro, linux-next, linux-kernel, Linus Torvalds
In-Reply-To: <20120604125724.603f62215c9dc9269db898a2@canb.auug.org.au>
On Mon, Jun 04, 2012 at 12:57:24PM +1000, Stephen Rothwell wrote:
> Hi Al,
>
> Building the origin tree (v3.5-rc1 sh lboxre2_defconfig and other sh
> configs) failed like this:
>
> arch/sh/include/asm/thread_info.h:172:2: error: 'TAINT_WARN' undeclared (first use in this function)
>
> Caused by commit edd63a2763bd ("set_restore_sigmask() is never called
> without SIGPENDING (and never should be)"). Missing include of kernel.h.
>
Ideally bug.h should be including linux/kernel.h itself due to its
TAINT_WARN dependence, it just seems to be getting lucky on other
platforms who either don't have this combination or pull in kernel.h from
somewhere else.
That commit also introduces a linux/bug.h include for WARN_ON() in
linux/thread_info.h which would be similarly insufficient for any
TIF_RESTORE_SIGMASK && !HAVE_SET_RESTORE_SIGMASK platform that also uses
asm-generic/bug.h.
Given that, I'd prefer stuffing the include in asm-generic directly:
---
bug.h: need linux/kernel.h for TAINT_WARN.
asm-generic/bug.h uses taint flags that are only defined in
linux/kernel.h, resulting in build failures on platforms that
don't include linux/kernel.h some other way:
arch/sh/include/asm/thread_info.h:172:2: error: 'TAINT_WARN' undeclared (first use in this function)
Caused by commit edd63a2763bd ("set_restore_sigmask() is never called
without SIGPENDING (and never should be)").
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
---
diff --git a/include/asm-generic/bug.h b/include/asm-generic/bug.h
index 2520a6e..9f02005 100644
--- a/include/asm-generic/bug.h
+++ b/include/asm-generic/bug.h
@@ -2,6 +2,7 @@
#define _ASM_GENERIC_BUG_H
#include <linux/compiler.h>
+#include <linux/kernel.h>
#ifdef CONFIG_BUG
^ permalink raw reply related
* Re: linux-next: build failure after merge of the sound-asoc tree
From: Mark Brown @ 2012-06-04 7:19 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Liam Girdwood, linux-next, linux-kernel, Ola Lilja
In-Reply-To: <20120604132500.56c579be8e468d9c20fc0b28@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 366 bytes --]
On Mon, Jun 04, 2012 at 01:25:00PM +1000, Stephen Rothwell wrote:
> ERROR: "clk_enable" [sound/soc/snd-soc-core.ko] undefined!
> ERROR: "clk_disable" [sound/soc/snd-soc-core.ko] undefined!
> ERROR: "clk_get" [sound/soc/snd-soc-core.ko] undefined!
Oh, fail - it looks like the stubs for the clock API didn't actually
manage to get merged. Should be fixed, anyway.
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: Request for inclusion of ep93xx tree in linux-next
From: Stephen Rothwell @ 2012-06-04 6:55 UTC (permalink / raw)
To: Ryan Mallon
Cc: H Hartley Sweeten, Mika Westerberg, Arnd Bergmann, arm,
'linux-arm-kernel@lists.infradead.org', linux-next
In-Reply-To: <4FCC4D0D.8000504@gmail.com>
[-- Attachment #1: Type: text/plain, Size: 438 bytes --]
Hi Ryan,
On Mon, 04 Jun 2012 15:52:13 +1000 Ryan Mallon <rmallon@gmail.com> wrote:
>
> I have ended up adding another branch to my ep93xx tree, so I have
> created an ep93xx-for-next branch, which I will just merge all of
> branches into. Can you please drop the ep93xx-cleanup and ep93xx-fixes
> branches and just include ep93xx-for-next instead.
Done.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: Request for inclusion of ep93xx tree in linux-next
From: Ryan Mallon @ 2012-06-04 5:52 UTC (permalink / raw)
To: Stephen Rothwell, H Hartley Sweeten, Mika Westerberg,
Arnd Bergmann
Cc: arm, 'linux-arm-kernel@lists.infradead.org', linux-next
In-Reply-To: <4F9F16A9.9090108@gmail.com>
Hi Stephen,
I have ended up adding another branch to my ep93xx tree, so I have
created an ep93xx-for-next branch, which I will just merge all of
branches into. Can you please drop the ep93xx-cleanup and ep93xx-fixes
branches and just include ep93xx-for-next instead.
Thanks,
~Ryan
On 01/05/12 08:48, Ryan Mallon wrote:
> Hi Stephen,
>
> Can you please add the following branches:
>
> ep93xx-cleanup
> ep93xx-fixes
>
> from the ep93xx git tree:
>
> git://github.com/RyanMallon/linux-ep93xx.git
>
> To linux-next. Both branches are stable and based on v3.4-rc2. Testing
> for the tree is covered by the arm ep93xx_defconfig.
>
> Thanks,
> ~Ryan
^ permalink raw reply
* linux-next: Tree for Jun 4
From: Stephen Rothwell @ 2012-06-04 5:40 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 26453 bytes --]
Hi all,
Changes since 20120601:
New tree: leds
The ecryptfs tree lost its conflict.
The vfs tree lost its build failure.
The acpi tree lost its conflict but gained another against the
hwmon-staging tree.
The mtd tree lost its conflict.
The sound-asoc tree gained a build failure so I used the version from
next-20120601.
The tip tree gained a conflict against Linus' tree.
The signal tree lost its conflict.
The akpm tree gained a conflict against Linus' and lost many patches that
turned up elsewhere.
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one. You should use "git fetch" as mentioned in the FAQ on the wiki
(see below).
You can see which trees have been included by looking in the Next/Trees
file in the source. There are also quilt-import.log and merge.log files
in the Next directory. Between each merge, the tree was built with
a ppc64_defconfig for powerpc and an allmodconfig for x86_64. After the
final fixups (if any), it is also built with powerpc allnoconfig (32 and
64 bit), ppc44x_defconfig and allyesconfig (minus
CONFIG_PROFILE_ALL_BRANCHES - this fails its final link) and i386, sparc
and sparc64 defconfig. These builds also have
CONFIG_ENABLE_WARN_DEPRECATED, CONFIG_ENABLE_MUST_CHECK and
CONFIG_DEBUG_INFO disabled when necessary.
Below is a summary of the state of the merge.
We are up to 190 trees (counting Linus' and 26 trees of patches pending
for Linus' tree), more are welcome (even if they are currently empty).
Thanks to those who have contributed, and to those who haven't, please do.
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Randy Dunlap for doing many randconfig builds. And to Paul
Gortmaker for triage and bug fixes.
There is a wiki covering stuff to do with linux-next at
http://linux.f-seidel.de/linux-next/pmwiki/ . Thanks to Frank Seidel.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
$ git checkout master
$ git reset --hard stable
Merging origin/master (f8f5701 Linux 3.5-rc1)
Merging fixes/master (b1a808f Merge branch 'for-next' of git://gitorious.org/kernel-hsi/kernel-hsi)
Merging kbuild-current/rc-fixes (e88aa7b Fix modpost failures in fedora 17)
Merging arm-current/fixes (ef0c148 ARM: neponset: make sure neponset_ncr_frob() is exported)
Merging ep93xx-current/ep93xx-fixes (2b3c83e dmaengine/ep93xx_dma: Implement double buffering for M2M DMA channels)
Merging m68k-current/for-linus (f25e918 m68k: Setup CROSS_COMPILE at the top)
Merging powerpc-merge/merge (7c0482e powerpc/irq: Fix another case of lazy IRQ state getting out of sync)
Merging sparc/master (e49e6ff sparc: fix sparc64 build due to leon.h inclusion)
Merging net/master (f8f5701 Linux 3.5-rc1)
Merging sound-current/for-linus (fbf2045 Merge tag 'asoc-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus)
Merging pci-current/for-linus (314489b Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc)
Merging wireless/master (7b21aea mac80211: fix ADDBA declined after suspend with wowlan)
Merging driver-core.current/driver-core-linus (61011677 Merge tag 'dlm-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm)
Merging tty.current/tty-linus (61011677 Merge tag 'dlm-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm)
Merging usb.current/usb-linus (61011677 Merge tag 'dlm-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm)
Merging staging.current/staging-linus (61011677 Merge tag 'dlm-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm)
Merging char-misc.current/char-misc-linus (61011677 Merge tag 'dlm-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm)
Merging input-current/for-linus (e644dae Merge branch 'next' into for-linus)
Merging md-current/for-linus (1dff2b8 md/bitmap: record the space available for the bitmap in the superblock.)
Merging audit-current/for-linus (c158a35 audit: no leading space in audit_log_d_path prefix)
Merging crypto-current/master (7c8d518 crypto: aesni-intel - fix unaligned cbc decrypt for x86-32)
Merging ide/master (0ab3d8b cy82c693: fix PCI device selection)
Merging dwmw2/master (244dc4e Merge git://git.infradead.org/users/dwmw2/random-2.6)
Merging sh-current/sh-fixes-for-linus (3c3c801 Merge branch 'sh/urgent' into sh-fixes-for-linus)
Merging irqdomain-current/irqdomain/merge (15e06bf irqdomain: Fix debugfs formatting)
Merging devicetree-current/devicetree/merge (4e8383b of: release node fix for of_parse_phandle_with_args)
Merging spi-current/spi/merge (d1c185b of/spi: Fix SPI module loading by using proper "spi:" modalias prefixes.)
Merging gpio-current/gpio/merge (96b7064 gpio/tca6424: merge I2C transactions, remove cast)
Merging arm/for-next (bcccc50 ARM: 7420/1: Improve build environment isolation)
Merging arm-perf/for-next/perf (d0a5710 ARM: perf: remove arm_perf_pmu_ids global enumeration)
Merging davinci/davinci-next (fe0d422 Linux 3.0-rc6)
Merging samsung/next-samsung (9edb240 ARM: H1940/RX1950: Change default LED triggers)
Merging xilinx/arm-next (b85a3ef ARM: Xilinx: Adding Xilinx board support)
Merging blackfin/for-linus (672552a blackfin: fix build after add bf60x mach/pm.h)
Merging c6x/for-linux-next (8ff98b9 C6X: remove unused config items)
Merging cris/for-next (7b91747 cris: Remove old legacy "-traditional" flag from arch-v10/lib/Makefile)
Merging hexagon/linux-next (5042ab9 various Kconfig cleanup and old platform build code removal)
Merging ia64/next (4035c6d [IA64] Liberate the signal layer from IA64 assembler)
Merging m68k/for-next (f25e918 m68k: Setup CROSS_COMPILE at the top)
Merging m68knommu/for-next (7094ac0 m68k: add a defconfig for the M5475EVB ColdFire with MMU board)
Merging microblaze/next (a01ee16 Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd)
Merging mips/mips-for-linux-next (6d26004 Merge branches 'next/jz4740', 'next/lantiq' and 'next/netlogic' into mips-for-linux-next)
Merging openrisc/for-upstream (207e715 openrisc: use scratch regs in atomic syscall)
Merging parisc/for-next (2f649c1 [PARISC] fix TLB fault path on PA2.0 narrow systems)
Merging powerpc/next (2074b1d powerpc: Fix irq distribution)
Merging 4xx/next (dce4c92 powerpc/40x: Use {upper,lower}_32_bits for msi_phys)
Merging mpc5xxx/next (f8d5842 powerpc: Option FB_FSL_DIU is not really optional for mpc512x)
Merging galak/next (fa1b42b powerpc/qe: Update the SNUM table for MPC8569 Rev2.0)
Merging s390/features (491af99 s390/uaccess: fix access_ok compile warnings)
Merging sh/sh-latest (43d3f86 sh: use the new generic strnlen_user() function)
Merging sparc-next/master (31a6710 Fix blocking allocations called very early during bootup)
Merging tile/master (f1aebc1 arch/tile: tilegx PCI root complex support)
Merging unicore32/unicore32 (0994695 Merge branch 'akpm' (aka "Andrew's patch-bomb, take two"))
Merging ceph/master (6bd9adb libceph: fix pg_temp updates)
Merging cifs/for-next (8825736 CIFS: Move get_next_mid to ops struct)
Merging configfs/linux-next (b930c26 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs)
Merging ecryptfs/next (86c47b7 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal)
Merging ext3/for_next (0324876 ext2: trivial fix to comment for ext2_free_blocks)
Merging ext4/dev (5e44f8c ext4: hole-punch use truncate_pagecache_range)
Merging fuse/for-next (203627b fuse: fix blksize calculation)
Merging gfs2/master (72c04af fbdev: sh_mobile_lcdc: Don't confuse line size with pitch)
Merging logfs/master (cd8bfa9 logfs: initialize the number of iovecs in bio)
Merging nfs/linux-next (12cb3e8 Merge branch 'devel' into linux-next)
CONFLICT (content): Merge conflict in fs/inode.c
Merging nfsd/nfsd-next (6eccece nfsd4: fix, consolidate client_has_state)
Merging ocfs2/linux-next (9392557 ocfs2: avoid unaligned access to dqc_bitmap)
Merging omfs/for-next (976d167 Linux 3.1-rc9)
Merging squashfs/master (4b0180a Squashfs: add mount time sanity check for block_size and block_log match)
Merging v9fs/for-next (01627d9 Merge branch 'drm-fixes-intel' of git://people.freedesktop.org/~airlied/linux)
Merging ubifs/linux-next (62f38455 UBI: modify ubi_wl_flush function to clear work queue for a lnum)
Merging xfs/for-next (14c26c6 xfs: add trace points for log forces)
Merging vfs/for-next (f37a02b unexport do_munmap())
CONFLICT (content): Merge conflict in security/security.c
Merging pci/next (5420e46 microblaze/PCI: fix "io_offset undeclared" error)
Merging hid/for-next (3c2c4b7 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid)
Merging quilt/i2c (af56e0a Merge git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client)
Merging bjdooks-i2c/next-i2c (fc84fe1 Merge branch 'for_3.3/i2c/misc' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into for-33/i2c/omap)
CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-omap.c
Merging i2c-embedded/i2c-embedded/for-next (9868a06 i2c: davinci: Free requested IRQ in remove)
Merging quilt/jdelvare-hwmon (7ae8d78 hwmon: (coretemp) Improve support of recent Atom CPU models)
Merging hwmon-staging/hwmon-next (418e787 hwmon: Driver for DA9052/53 PMIC)
Merging v4l-dvb/master (20a2218 Merge /home/v4l/v4l/patchwork)
Merging kbuild/for-next (e499c75 Merge branch 'kbuild/misc' into kbuild/for-next)
Merging kconfig/for-next (eae1c36 Merge branch 'kconfig/for-linus-2' into kconfig/for-next)
Merging libata/NEXT (2fff275 PATA host controller driver for ep93xx)
Merging infiniband/for-next (e979fb9 Merge branch 'mlx4' into for-next)
CONFLICT (content): Merge conflict in drivers/net/ethernet/emulex/benet/be_main.c
CONFLICT (content): Merge conflict in drivers/net/ethernet/emulex/benet/be_cmds.c
CONFLICT (content): Merge conflict in drivers/net/ethernet/emulex/benet/be.h
Merging acpi/next (d9622b5 Revert "ACPI, PM, Specify lowest allowed state for device sleep state")
CONFLICT (content): Merge conflict in drivers/hwmon/Kconfig
Merging cpupowerutils/master (f166033 cpupower tools: add install target to the debug tools' makefiles)
Merging ieee1394/for-next (9d60ef2 firewire: ohci: lazy bus time initialization)
Merging ubi/linux-next (d48b97b Linux 3.4-rc6)
Merging dlm/next (75af271e dlm: NULL dereference on failure in kmem_cache_create())
Merging scsi/for-next (8d55e50 [SCSI] fcoe, bnx2fc, libfcoe: SW FCoE and bnx2fc use FCoE Syfs)
Merging target-updates/for-next (f80e8ed iscsi-target: Fix iov_count calculation bug in iscsit_allocate_iovecs)
Merging target-merge/for-next-merge (54131ef Merge branch 'sbp-target-merge' into for-next-merge)
Merging ibft/linux-next (935a9fe ibft: Fix finding IBFT ACPI table on UEFI)
Merging isci/all (6df8ea3 merge: devel rnc-devel fixes)
Merging slave-dma/next (1dd1ea8 dmaengine: at_hdmac: take maxburst from slave configuration)
Merging dmaengine/next (a2bd114 netdma: adding alignment check for NETDMA ops)
Merging net-next/master (f8f5701 Linux 3.5-rc1)
Merging wireless-next/master (05f8f25 Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next)
Merging bluetooth/master (b0daec4 Bluetooth: Remove magic disconnect reason)
Merging mtd/master (4a43faf mtd: mxc_nand: move ecc strengh setup before nand_scan_tail)
Merging l2-mtd/master (667b67e nand: mxc_nand: Use clk_prepare_enable/clk_disable_unprepare)
Merging crypto/master (ef45b83 crypto: aesni-intel - move more common code to ablk_init_common)
Merging drm/drm-next (8c91402 Merge branch 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-core-next)
Merging sound/for-next (508745c Merge branch 'for-linus' into for-next)
Merging sound-asoc/for-next (f59fef4 ASoC: wm8350: Convert to direct regmap API usage)
$ git reset --hard HEAD^
Merging refs/next/20120601/sound-asoc
Merging quilt/rr (56abc41 brlocks/lglocks: turn into functions)
CONFLICT (content): Merge conflict in fs/namespace.c
Merging input/next (8680917 Input: matrix-keymap - fix building keymaps)
Merging input-mt/for-next (66f75a5 Linux 3.4-rc4)
Merging cgroup/for-next (fa980ca cgroup: superblock can't be released with active dentries)
Merging block/for-next (723c0b7 Kill merge marker in Documentation/feature-removal.txt)
CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt
Merging quilt/device-mapper (7c66983 Remove the restriction that limits a target's specified maximum incoming I/O size to be a power of 2.)
Merging embedded/master (4744b43 embedded: fix vc_translate operator precedence)
Merging firmware/master (6e03a20 firmware: speed up request_firmware(), v3)
Merging pcmcia/master (80af9e6 pcmcia at91_cf: fix raw gpio number usage)
Merging mmc/mmc-next (0caaa95 mmc: at91-mci: this driver is now deprecated)
Merging kgdb/kgdb-next (3751d3e x86,kgdb: Fix DEBUG_RODATA limitation using text_poke())
Merging slab/for-next (f50d5ae Merge branch 'slab/next' into for-next)
Merging uclinux/for-next (5e442a4 Revert "proc: fix races against execve() of /proc/PID/fd**")
Merging md/for-next (aba336b md: raid1/raid10: fix problem with merge_bvec_fn)
Merging mfd/for-next (29f772d mfd: Fix build break of max77693 by adding REGMAP_I2C option)
Merging battery/master (96facd2 smb347-charger: Include missing <linux/err.h>)
Merging fbdev/fbdev-next (c895305 video: bfin_adv7393fb: Fix cleanup code)
Merging viafb/viafb-next (838ac78 viafb: avoid refresh and mode lookup in set_par)
Merging omap_dss2/for-next (05dd0f5 OMAPDSS: DISPC: Update Accumulator configuration for chroma plane)
Merging regulator/for-next (2e3f7f2 regulator: max77686: Use regulator_map_voltage_linear for simple linear mappings)
Merging security/next (ff2bb04 Merge branch 'master' of git://git.infradead.org/users/eparis/selinux into next)
Merging selinux/master (c737f82 SELinux: remove unused common_audit_data in flush_unauthorized_files)
Merging lblnet/master (7e27d6e Linux 2.6.35-rc3)
Merging watchdog/master (f8f5701 Linux 3.5-rc1)
Merging dwmw2-iommu/master (c3b92c8 Linux 3.1)
Merging iommu/next (28f8571 Merge branches 'iommu/fixes', 'dma-debug', 'arm/omap', 'arm/tegra', 'core' and 'x86/amd' into next)
Merging osd/linux-next (8b56a30 exofs: Add SYSFS info for autologin/pNFS export)
Merging jc_docs/docs-next (5c050fb docs: update the development process document)
Merging trivial/for-next (d2582a7 Doc: document max raw dev number)
Merging audit/for-next (dcd6c92 Linux 3.3-rc1)
Merging pm/linux-next (6da5e30e Merge branch 'pm-acpi' into linux-next)
Merging apm/for-next (f283d22 APM: fix deadlock in APM_IOC_SUSPEND ioctl)
Merging fsnotify/for-next (1aec9c0 inotify: automatically restart syscalls)
Merging edac/linux_next (29a6674 Merge branch 'fixes' into next)
Merging edac-amd/for-next (305f1c3 Merge branch '3.3-pci_device_id' into edac-for-next)
CONFLICT (content): Merge conflict in drivers/edac/amd64_edac.c
CONFLICT (content): Merge conflict in Documentation/edac.txt
Merging devicetree/devicetree/next (8d6c1ef Merge branch 'devicetree/merge' into devicetree/next)
Merging spi/spi/next (d8e328b spi: Add "spi:" prefix to modalias attribute of spi devices)
Merging tip/auto-latest (4b7a762 Merge branch 'x86/urgent')
CONFLICT (content): Merge conflict in kernel/fork.c
CONFLICT (content): Merge conflict in arch/x86/syscalls/syscall_64.tbl
CONFLICT (content): Merge conflict in arch/x86/syscalls/syscall_32.tbl
Merging rcu/rcu/next (860e1cc rcu: Fix broken strings in RCU's source code.)
Merging cputime/cputime (c3e0ef9 [S390] fix cputime overflow in uptime_proc_show)
Merging uprobes/for-next (0326f5a uprobes/core: Handle breakpoint and singlestep exceptions)
Merging kmemleak/kmemleak (4878677 kmemleak: do not leak object after tree insertion error)
Merging kvm/linux-next (b48b2c3 openrisc: use generic strnlen_user() function)
Merging kvm-ppc/kvm-ppc-next (555b092 KVM: PPC: Not optimizing MSR_CE and MSR_ME with paravirt.)
Merging oprofile/for-next (c16fa4f Linux 3.3)
Merging xen/upstream/xen (af3a3ab Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes)
Merging xen-two/linux-next (703daa2 Merge branch 'stable/for-linus-3.5' into linux-next)
Merging xen-pvhvm/linux-next (b056b6a xen: suspend: remove xen_hvm_suspend)
Merging percpu/for-next (61011677 Merge tag 'dlm-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm)
Merging workqueues/for-next (61011677 Merge tag 'dlm-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm)
Merging drivers-x86/linux-next (d0e0a477 dell-laptop: Add touchpad led support for Dell V3450)
Merging hwpoison/hwpoison (46e387b Merge branch 'hwpoison-hugepages' into hwpoison)
Merging sysctl/master (4e474a0 sysctl: protect poll() in entries that may go away)
Merging regmap/for-next (154063f Merge branches 'regmap-core' and 'regmap-linus' into regmap-next)
Merging hsi/for-next (43139a6 HSI: hsi_char: Update ioctl-number.txt)
Merging leds/for-next (60b39ec led-triggers: rename *trigger to *trig for unified naming scheme)
Merging driver-core/driver-core-next (61011677 Merge tag 'dlm-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm)
Merging tty/tty-next (61011677 Merge tag 'dlm-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm)
Merging usb/usb-next (61011677 Merge tag 'dlm-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm)
Merging staging/staging-next (61011677 Merge tag 'dlm-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm)
Merging char-misc/char-misc-next (61011677 Merge tag 'dlm-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm)
Merging tmem/linux-next (0f1ea93 Merge branch 'stable/frontswap.v14' into linux-next)
CONFLICT (content): Merge conflict in mm/Makefile
Merging writeback/writeback-for-next (027310a block: Convert BDI proportion calculations to flexible proportions)
Merging arm-dt/devicetree/arm-next (ede338f dt: add documentation of ARM dt boot interface)
Merging hwspinlock/linux-next (8b37fcf hwspinlock: add MAINTAINERS entries)
Merging pinctrl/for-next (0db193b pinctrl: add pinctrl_add_gpio_ranges function)
Merging moduleh/for-sfr (f9e1b2b tile: fix compile failure on start_kernel in setup.c)
Merging vhost/linux-next (e0953c8 tun: experimental zero copy tx support)
Merging kmap_atomic/kmap_atomic (317b6e1 feature-removal-schedule.txt: schedule the deprecated form of kmap_atomic() for removal)
Merging memblock/memblock-kill-early_node_map (7bd0b0f memblock: Reimplement memblock allocation using reverse free area iterator)
Merging remoteproc/for-next (d48b97b Linux 3.4-rc6)
Merging irqdomain/irqdomain/next (a87487e irqdomain: Document size parameter of irq_domain_add_linear())
Merging gpio/gpio/next (3e11f7b gpio/generic: initialize basic_mmio_gpio shadow variables properly)
Merging arm-soc/for-next (9bd9695 Merge branch 'devel-late' into for-next)
Merging ep93xx/ep93xx-cleanup (a1eacd7 arm: ep93xx: use gpio_led_register_device)
Merging renesas/next (76ab1e9 Merge branch 'renesas-emev2' into renesas-next)
CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/Makefile
CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/Kconfig
Merging s5p/for-next (3bd5eba Merge branch 'next/board-samsung-2' into for-next)
Merging tegra/for-next (ef14f5c Merge branch 'for-3.5/defconfig2' into for-next)
Merging kvmtool/master (65f6411 kvm tools: Remove unused req_mutex variable.)
Merging dma-mapping/dma-mapping-next (89e2a7c Merge branch 'for-next-other' into for-next)
Merging dma-buf/for-next (b48b2c3 openrisc: use generic strnlen_user() function)
Merging userns/for-next (4b06a81 userns: Silence silly gcc warning.)
Merging ktest/for-next (648a182 ktest: Allow a test to override REBOOT_ON_SUCCESS)
Merging signal/for-next (c0a9b61 Uninclude linux/freezer.h)
Merging scsi-post-merge/merge-base:master ()
$ git checkout akpm
Applying: umem: fix up unplugging
Applying: cciss: fix incorrect scsi status reporting
Applying: arch/x86/platform/iris/iris.c: register a platform device and a platform driver
Applying: arch/x86/include/asm/spinlock.h: fix comment
Applying: timeconst.pl: remove deprecated defined(@array)
Applying: ocfs2: use find_last_bit()
Applying: ocfs2: use bitmap_weight()
Applying: drivers/scsi/ufs: use module_pci_driver
Applying: drivers/scsi/ufs: reverse the ufshcd_is_device_present logic
Applying: drivers/scsi/ufs: fix incorrect return value about SUCCESS and FAILED
Applying: drivers/scsi/atp870u.c: fix bad use of udelay
Applying: fs: symlink restrictions on sticky directories
Applying: fs: hardlink creation restrictions
Applying: hugetlb: rename max_hstate to hugetlb_max_hstate
Applying: hugetlbfs: don't use ERR_PTR with VM_FAULT* values
Applying: hugetlbfs: add an inline helper for finding hstate index
Applying: hugetlb: use mmu_gather instead of a temporary linked list for accumulating pages
Applying: hugetlb-use-mmu_gather-instead-of-a-temporary-linked-list-for-accumulating-pages-fix
Applying: hugetlb-use-mmu_gather-instead-of-a-temporary-linked-list-for-accumulating-pages-fix-fix
Applying: hugetlb-use-mmu_gather-instead-of-a-temporary-linked-list-for-accumulating-pages-fix-2
Applying: hugetlb: avoid taking i_mmap_mutex in unmap_single_vma() for hugetlb
Applying: hugetlb: simplify migrate_huge_page()
Applying: memcg: add HugeTLB extension
Applying: memcg-add-hugetlb-extension-fix
Applying: memcg-add-hugetlb-extension-fix-fix
Applying: hugetlb: add charge/uncharge calls for HugeTLB alloc/free
Applying: memcg: track resource index in cftype private
Applying: hugetlbfs: add memcg control files for hugetlbfs
Applying: memcg: use scnprintf instead of sprintf
Applying: hugetlbfs-add-memcg-control-files-for-hugetlbfs-use-scnprintf-instead-of-sprintf-fix
Applying: hugetlbfs: add a list for tracking in-use HugeTLB pages
Applying: memcg: move HugeTLB resource count to parent cgroup on memcg removal
Applying: memcg-move-hugetlb-resource-count-to-parent-cgroup-on-memcg-removal-fix
Applying: memcg-move-hugetlb-resource-count-to-parent-cgroup-on-memcg-removal-fix-fix
Applying: hugetlb: migrate memcg info from oldpage to new page during migration
Applying: hugetlb-migrate-memcg-info-from-oldpage-to-new-page-during-migration-fix
Applying: hugetlb-use-mmu_gather-instead-of-a-temporary-linked-list-for-accumulating-pages-fix-2
Applying: memcg: add memory controller documentation for hugetlb management
Applying: mm: correctly synchronize rss-counters at exit/exec
CONFLICT (content): Merge conflict in kernel/fork.c
Applying: sgi-xp: use lockdep_assert_held()
Applying: drivers/scsi/aha152x.c: remove broken usage of spin_is_locked()
Applying: XFS: fix lock ASSERT on UP
Applying: mm/huge_memory.c: use lockdep_assert_held()
Applying: futex: use lockdep_assert_held() for lock checking
Applying: drivers/net/irda/sir_dev.c: remove spin_is_locked()
Applying: drivers/net/ethernet/smsc/smsc911x.h: use lockdep_assert_held() instead of home grown buggy construct
Applying: spinlocks.txt: add a discussion on why spin_is_locked() is bad
Applying: spinlockstxt-add-a-discussion-on-why-spin_is_locked-is-bad-fix
Applying: include/linux/spinlock.h: add a kerneldoc comment to spin_is_locked() that discourages its use
Applying: checkpatch: check for spin_is_locked()
Applying: locking: add KERN_CONT when needed to self test
Applying: ISDN: add missing KERN_CONT
Applying: clk: add non CONFIG_HAVE_CLK routines
Applying: clk: remove redundant depends on from drivers/Kconfig
Applying: i2c/i2c-pxa: remove conditional compilation of clk code
Applying: usb/marvell: remove conditional compilation of clk code
Applying: usb/musb: remove conditional compilation of clk code
Applying: ata/pata_arasan: remove conditional compilation of clk code
Applying: ata/sata_mv: remove conditional compilation of clk code
Applying: net/c_can: remove conditional compilation of clk code
Applying: net/stmmac: remove conditional compilation of clk code
Applying: gadget/m66592: remove conditional compilation of clk code
Applying: gadget/r8a66597: remove conditional compilation of clk code
Applying: usb/host/r8a66597: remove conditional compilation of clk code
Applying: NMI watchdog: fix for lockup detector breakage on resume
Applying: nmi-watchdog-fix-for-lockup-detector-breakage-on-resume-fix
Applying: nmi-watchdog-fix-for-lockup-detector-breakage-on-resume-fix-fix-fix
Applying: nmi-watchdog-fix-for-lockup-detector-breakage-on-resume-fix-fix
Applying: watchdog: fix for lockup detector breakage on resume
Applying: nmi-watchdog-fix-for-lockup-detector-breakage-on-resume-v2-fix
Applying: leds: add LED driver for lm3556 chip
Applying: leds-add-led-driver-for-lm3556-chip-checkpatch-fixes
Applying: leds: lm3556: don't call kfree for the memory allocated by devm_kzalloc
Applying: kmod: avoid deadlock from recursive kmod call
Applying: proc: unify ptrace_may_access() locking code
Applying: proc/smaps: show amount of hwpoison pages
Applying: proc: use IS_ERR_OR_NULL()
Applying: ipc/sem.c: alternatives to preempt_disable()
Applying: pidns: guarantee that the pidns init will be the last pidns process reaped
Applying: fs, proc: introduce /proc/<pid>/task/<tid>/children entry
Applying: c/r: fs, proc: Move children entry back to tid_base_stuff
Applying: c/r: prctl: update prctl_set_mm_exe_file() after mm->num_exe_file_vmas removal
Applying: c/r: prctl: add ability to get clear_tid_address
Applying: c/r: prctl: drop VMA flags test on PR_SET_MM_ stack data assignment
Applying: notify_change(): check that i_mutex is held
Merging quilt/akpm (d35e3fb notify_change(): check that i_mutex is held)
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: manual merge of the akpm tree with Linus' tree
From: Stephen Rothwell @ 2012-06-04 4:58 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-next, linux-kernel, Konstantin Khlebnikov
[-- Attachment #1: Type: text/plain, Size: 1127 bytes --]
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in kernel/fork.c
between commit touching paths: ("fork: call complete_vfork_done() after
clearing child_tid and flushing rss-counters") from Linus' tree and
commit "mm: correctly synchronize rss-counters at exit/exec" from the
akpm tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc kernel/fork.c
index 095a951,30e9ee8..0000000
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@@ -808,11 -811,12 +808,19 @@@ void mm_release(struct task_struct *tsk
}
/*
+ * Final rss-counter synchronization. After this point there must be
+ * no pagefaults into this mm from the current context. Otherwise
+ * mm->rss_stat will be inconsistent.
+ */
+ if (mm)
+ sync_mm_rss(mm);
++
++ /*
+ * All done, finally we can wake up parent and return this mm to him.
+ * Also kthread_stop() uses this completion for synchronization.
+ */
+ if (tsk->vfork_done)
+ complete_vfork_done(tsk);
}
/*
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: [PATCH -next] acpi: fix acpi_bus.h warnings when ACPI is not enabled
From: Len Brown @ 2012-06-04 4:32 UTC (permalink / raw)
To: Randy Dunlap
Cc: Stephen Rothwell, linux-next, LKML, linux-acpi, Matthew Garrett
In-Reply-To: <4FBD0CDD.6010003@xenotime.net>
Hi Randy,
with your patch applied and CONFIG_ACPI=n, I still get:
include/acpi/acpi_bus.h:445:12: warning: ‘register_acpi_bus_type’ defined but not used [-Wunused-function]
include/acpi/acpi_bus.h:446:12: warning: ‘unregister_acpi_bus_type’ defined but not used [-Wunused-function]
so I think I prefer the patch below.
thanks,
Len Brown, Intel Open Source Technology Center
On 05/23/2012 12:14 PM, Randy Dunlap wrote:
> From: Randy Dunlap <rdunlap@xenotime.net>
>
> Fix header file warnings when CONFIG_ACPI is not enabled:
>
> include/acpi/acpi_bus.h:443:42: warning: 'struct acpi_bus_type' declared inside parameter list
> include/acpi/acpi_bus.h:443:42: warning: its scope is only this definition or declaration, which is probably not what you want
> include/acpi/acpi_bus.h:444:44: warning: 'struct acpi_bus_type' declared inside parameter list
>
> Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
> ---
> include/acpi/acpi_bus.h | 2 ++
> 1 file changed, 2 insertions(+)
>
> --- linux-next-20120523.orig/include/acpi/acpi_bus.h
> +++ linux-next-20120523/include/acpi/acpi_bus.h
> @@ -440,6 +440,8 @@ static inline int acpi_pm_device_sleep_w
>
> #else /* CONFIG_ACPI */
>
> +struct acpi_bus_type;
> +
> static int register_acpi_bus_type(struct acpi_bus_type *bus) { return 0; }
> static int unregister_acpi_bus_type(struct acpi_bus_type *bus) { return 0; }
>
Subject: [PATCH] ACPI: fix acpi_bus.h build warnings when ACPI is not enabled
introduced in Linux-3.5-rc1 by
66886d6f8c9bcdee3d7fce5796dcffd6b4bc0b48
(ACPI: Add stubs for (un)register_acpi_bus_type)
Fix header file warnings when CONFIG_ACPI is not enabled:
include/acpi/acpi_bus.h:443:42: warning: 'struct acpi_bus_type' declared inside parameter list
include/acpi/acpi_bus.h:443:42: warning: its scope is only this definition or declaration, which is probably not
include/acpi/acpi_bus.h:444:44: warning: 'struct acpi_bus_type' declared inside parameter list
Signed-off-by: Len Brown <len.brown@intel.com>
---
include/acpi/acpi_bus.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
index b0d6282..9e6e1c6 100644
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
@@ -440,8 +440,8 @@ static inline int acpi_pm_device_sleep_wake(struct device *dev, bool enable)
#else /* CONFIG_ACPI */
-static int register_acpi_bus_type(struct acpi_bus_type *bus) { return 0; }
-static int unregister_acpi_bus_type(struct acpi_bus_type *bus) { return 0; }
+static inline int register_acpi_bus_type(void *bus) { return 0; }
+static inline int unregister_acpi_bus_type(void *bus) { return 0; }
#endif /* CONFIG_ACPI */
--
1.7.11.rc0.100.g5498c5f
^ permalink raw reply related
* linux-next: manual merge of the tip tree with Linus' tree
From: Stephen Rothwell @ 2012-06-04 3:52 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra
Cc: linux-next, linux-kernel, Cyrill Gorcunov, Andrew Morton
[-- Attachment #1: Type: text/plain, Size: 1722 bytes --]
Hi all,
Today's linux-next merge of the tip tree got a conflict in
arch/x86/syscalls/syscall_32.tbl arch/x86/syscalls/syscall_64.tbl between
commit d97b46a64674 ("syscalls, x86: add __NR_kcmp syscall") from Linus'
tree and commit a2dae61eb839 ("sched/numa: Introduce sys_numa_{t,m}bind()")
from the tip tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/x86/syscalls/syscall_32.tbl
index 7a35a6e,38954c5..0000000
--- a/arch/x86/syscalls/syscall_32.tbl
+++ b/arch/x86/syscalls/syscall_32.tbl
@@@ -355,4 -355,5 +355,6 @@@
346 i386 setns sys_setns
347 i386 process_vm_readv sys_process_vm_readv compat_sys_process_vm_readv
348 i386 process_vm_writev sys_process_vm_writev compat_sys_process_vm_writev
-349 i386 numa_mbind sys_numa_mbind compat_sys_numa_mbind
-350 i386 numa_tbind sys_numa_tbind compat_sys_numa_tbind
+349 i386 kcmp sys_kcmp
++350 i386 numa_mbind sys_numa_mbind compat_sys_numa_mbind
++351 i386 numa_tbind sys_numa_tbind compat_sys_numa_tbind
diff --cc arch/x86/syscalls/syscall_64.tbl
index 51171ae,63c5285..0000000
--- a/arch/x86/syscalls/syscall_64.tbl
+++ b/arch/x86/syscalls/syscall_64.tbl
@@@ -318,8 -318,8 +318,10 @@@
309 common getcpu sys_getcpu
310 64 process_vm_readv sys_process_vm_readv
311 64 process_vm_writev sys_process_vm_writev
-312 64 numa_mbind sys_numa_mbind
-313 64 numa_tbind sys_numa_tbind
+312 64 kcmp sys_kcmp
++313 64 numa_mbind sys_numa_mbind
++314 64 numa_tbind sys_numa_tbind
+
#
# x32-specific system call numbers start at 512 to avoid cache impact
# for native 64-bit operation.
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: linux-next: Tree for Jun 1 (scsi)
From: Randy Dunlap @ 2012-06-04 3:31 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, LKML, linux-scsi
In-Reply-To: <20120601132202.ac73b03c845299d384defeaf@canb.auug.org.au>
On 05/31/2012 08:22 PM, Stephen Rothwell wrote:
> Hi all,
>
> Changes since 20120531:
already fixed?
on i386 and x86_64, loadable module or builtin:
ERROR: "scsi_sd_probe_domain" [drivers/scsi/scsi_mod.ko] undefined!
or
(.text+0x4f6c77): undefined reference to `scsi_sd_probe_domain'
--
~Randy
(sorry about the delay, was out for 3 days)
^ permalink raw reply
* linux-next: build failure after merge of the sound-asoc tree
From: Stephen Rothwell @ 2012-06-04 3:25 UTC (permalink / raw)
To: Mark Brown, Liam Girdwood; +Cc: linux-next, linux-kernel, Ola Lilja
[-- Attachment #1: Type: text/plain, Size: 610 bytes --]
Hi all,
After merging the sound-asoc tree, today's linux-next build (x86_64
allmodconfig) failed like this:
ERROR: "clk_enable" [sound/soc/snd-soc-core.ko] undefined!
ERROR: "clk_disable" [sound/soc/snd-soc-core.ko] undefined!
ERROR: "clk_get" [sound/soc/snd-soc-core.ko] undefined!
Caused by commit d7e7eb91551a ("ASoC: core: Add widget
SND_SOC_DAPM_CLOCK_SUPPLY"). This build does not have CONFIG_COMMON_CLK
set. Probably missing select or dependency.
I have used the sound-asoc tree from next-20120601 for today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: manual merge of the acpi tree with the hwmon-staging tree
From: Stephen Rothwell @ 2012-06-04 3:03 UTC (permalink / raw)
To: Len Brown
Cc: linux-next, linux-kernel, Ashish Jangam, Guenter Roeck,
David Dajun Chen, Amit Daniel Kachhap, Donggeun Kim,
Andrew Morton
[-- Attachment #1: Type: text/plain, Size: 1551 bytes --]
Hi Len,
Today's linux-next merge of the acpi tree got a conflict in
drivers/hwmon/Kconfig between commit 418e7870dca9 ("hwmon: Driver for
DA9052/53 PMIC") from the hwmon-staging tree and commit f36beb016903
("hwmon: exynos4: move thermal sensor driver to driver/thermal
directory") from the acpi tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/hwmon/Kconfig
index 4039353,2c7ef39..0000000
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@@ -314,26 -314,6 +314,16 @@@ config SENSORS_DS162
This driver can also be built as a module. If so, the module
will be called ds1621.
+config SENSORS_DA9052_ADC
+ tristate "Dialog DA9052/DA9053 ADC"
+ depends on PMIC_DA9052
+ help
+ Say y here to support the ADC found on Dialog Semiconductor
+ DA9052-BC and DA9053-AA/Bx PMICs.
+
+ This driver can also be built as module. If so, the module
+ will be called da9052-hwmon.
+
- config SENSORS_EXYNOS4_TMU
- tristate "Temperature sensor on Samsung EXYNOS4"
- depends on ARCH_EXYNOS4
- help
- If you say yes here you get support for TMU (Thermal Management
- Unit) on SAMSUNG EXYNOS4 series of SoC.
-
- This driver can also be built as a module. If so, the module
- will be called exynos4-tmu.
-
config SENSORS_I5K_AMB
tristate "FB-DIMM AMB temperature sensor on Intel 5000 series chipsets"
depends on PCI && EXPERIMENTAL
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: build failure after merge of the origin tree
From: Stephen Rothwell @ 2012-06-04 2:57 UTC (permalink / raw)
To: Al Viro; +Cc: linux-next, linux-kernel, Linus Torvalds, Paul Mundt
[-- Attachment #1: Type: text/plain, Size: 434 bytes --]
Hi Al,
Building the origin tree (v3.5-rc1 sh lboxre2_defconfig and other sh
configs) failed like this:
arch/sh/include/asm/thread_info.h:172:2: error: 'TAINT_WARN' undeclared (first use in this function)
Caused by commit edd63a2763bd ("set_restore_sigmask() is never called
without SIGPENDING (and never should be)"). Missing include of kernel.h.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: Request to add linux-leds git tree to linux-next
From: Stephen Rothwell @ 2012-06-04 1:42 UTC (permalink / raw)
To: Bryan Wu; +Cc: linux-next, akpm, linux-leds
In-Reply-To: <CAK5ve-JqwHcmPGkG-_=3y9PiMo_QrFe-2tt-8aNMarzF7JxVMg@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 1819 bytes --]
Hi Bryan,
On Fri, 1 Jun 2012 22:08:12 +0800 Bryan Wu <bryan.wu@canonical.com> wrote:
>
> Please help to add for-next branch of my linux-leds git tree into linux-next:
> git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds.git for-next
Added from today.
Thanks for adding your subsystem tree as a participant of linux-next. As
you may know, this is not a judgment of your code. The purpose of
linux-next is for integration testing and to lower the impact of
conflicts between subsystems in the next merge window.
You will need to ensure that the patches/commits in your tree/series have
been:
* submitted under GPL v2 (or later) and include the Contributor's
Signed-off-by,
* posted to the relevant mailing list,
* reviewed by you (or another maintainer of your subsystem tree),
* successfully unit tested, and
* destined for the current or next Linux merge window.
Basically, this should be just what you would send to Linus (or ask him
to fetch). It is allowed to be rebased if you deem it necessary.
--
Cheers,
Stephen Rothwell
sfr@canb.auug.org.au
Legal Stuff:
By participating in linux-next, your subsystem tree contributions are
public and will be included in the linux-next trees. You may be sent
e-mail messages indicating errors or other issues when the
patches/commits from your subsystem tree are merged and tested in
linux-next. These messages may also be cross-posted to the linux-next
mailing list, the linux-kernel mailing list, etc. The linux-next tree
project and IBM (my employer) make no warranties regarding the linux-next
project, the testing procedures, the results, the e-mails, etc. If you
don't agree to these ground rules, let me know and I'll remove your tree
from participation in linux-next.
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: linux-next: fate of the ecryptfs tree
From: Stephen Rothwell @ 2012-06-02 3:37 UTC (permalink / raw)
To: Tyler Hicks; +Cc: linux-next, linux-kernel
In-Reply-To: <20120601234154.GB6340@boyd>
[-- Attachment #1: Type: text/plain, Size: 836 bytes --]
Hi Tyler,
On Fri, 1 Jun 2012 16:41:55 -0700 Tyler Hicks <tyhicks@canonical.com> wrote:
>
> On 2012-05-31 14:41:15, Stephen Rothwell wrote:
> >
> > I am just wondering about the fate of the ecryptfs tree. The most recent
> > commit to that tree is dated Feb 11 and seems to have been included in
> > Linus' tree as a different commit.
>
> My next branch has become stale. Sorry about that! I haven't been doing
> much development on the kernel side in the last couple months. That will
> soon change, as I have a few bug fixes in the works and I know of a
> contribution or two that should surface shortly.
Thanks for that.
> In the meantime, I've just pushed the HEAD of Linus' tree to my next
> branch to clean things up.
Excellent.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: linux-next: fate of the ecryptfs tree
From: Tyler Hicks @ 2012-06-01 23:41 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel
In-Reply-To: <20120531144115.0f35af0a8a5d79b73b0ecbe6@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 632 bytes --]
On 2012-05-31 14:41:15, Stephen Rothwell wrote:
> Hi Tyler,
>
> I am just wondering about the fate of the ecryptfs tree. The most recent
> commit to that tree is dated Feb 11 and seems to have been included in
> Linus' tree as a different commit.
My next branch has become stale. Sorry about that! I haven't been doing
much development on the kernel side in the last couple months. That will
soon change, as I have a few bug fixes in the works and I know of a
contribution or two that should surface shortly.
In the meantime, I've just pushed the HEAD of Linus' tree to my next
branch to clean things up.
Tyler
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* p ȫ k ẹ г ȫ ᾒ l i ᾒ ẹ
From: Samuel Pigeon @ 2012-06-01 21:45 UTC (permalink / raw)
To: linux@murphyslantech.de
In submission, it was solidly proffer 20. physically, the 21st, was the geographer of the equinox; the sun would smash below the delphinium for levin saw not counting refraction, and after its disappearance the funny overhand grouse would begin.
cṇϲῥ_http://ǩȧéὅ.twonysix.com?ţġőṕ
That was verily! He said the child fighted, kept on moaning and he stood admiring it.
^ permalink raw reply
* Re: [lm-sensors] [PATCH] hwmon/sch56xx: Depend on watchdog for watchdog core functions
From: Guenter Roeck @ 2012-06-01 15:25 UTC (permalink / raw)
To: Jean Delvare
Cc: Hans de Goede, Wim Van Sebroeck, linux-next@vger.kernel.org,
linux-watchdog@vger.kernel.org, LM Sensors
In-Reply-To: <20120601160657.3b93393c@endymion.delvare>
On Fri, Jun 01, 2012 at 10:06:57AM -0400, Jean Delvare wrote:
> On Fri, 01 Jun 2012 15:37:55 +0200, Hans de Goede wrote:
> > Now that we've a common watchdog core, I would also like to convert the
> > fschmd watchdog code to it (one of these days). Which raises the question
> > through which tree should that conversion go in. fschmd is primarily a hwmon
> > driver, but the changes will only touch the watchdog part...
> >
> > I guess it would be best to get the conversion in to Wim's tree, even though
> > that slightly increases the chance of conflicts. The fschmd driver does not see
> > a lot of churn, and I think Wim is a better reviewer for watchdog related
> > patches :)
>
> Chances of conflicts are so thin, I vote for getting it through Wim's
> watchdog tree.
>
Ok with me.
Guenter
^ permalink raw reply
* Re: linux-next: build rebase of the drivers-x86 tree
From: Matthew Garrett @ 2012-06-01 15:01 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Seth Forshee
In-Reply-To: <20120601080404.64da2644d5b26c7101e1e274@canb.auug.org.au>
On Fri, Jun 01, 2012 at 08:04:04AM +1000, Stephen Rothwell wrote:
> Hi Matthew,
>
> Looking through the drivers-x86 tree rebase today, I noticed in commit
> 62cce7526629 ("toshiba_acpi: Only register backlight device when
> interface is read/write") that a memset has been added in the wrong place
> - about line 1100 in function toshiba_acpi_setup_backlight().
That was me mis-merging - three commits all touched the backlight code
and I screwed it up. My fault.
--
Matthew Garrett | mjg59@srcf.ucam.org
^ permalink raw reply
* Request to add linux-leds git tree to linux-next
From: Bryan Wu @ 2012-06-01 14:08 UTC (permalink / raw)
To: linux-next; +Cc: akpm, linux-leds
Hi Stephen,
Please help to add for-next branch of my linux-leds git tree into linux-next:
git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds.git for-next
Thanks a lot,
--
Bryan Wu <bryan.wu@canonical.com>
Kernel Developer +86.186-168-78255 Mobile
Canonical Ltd. www.canonical.com
Ubuntu - Linux for human beings | www.ubuntu.com
^ permalink raw reply
* Re: [lm-sensors] [PATCH] hwmon/sch56xx: Depend on watchdog for watchdog core functions
From: Jean Delvare @ 2012-06-01 14:06 UTC (permalink / raw)
To: Hans de Goede
Cc: guenter.roeck, Wim Van Sebroeck, linux-next, linux-watchdog,
LM Sensors
In-Reply-To: <4FC8C5B3.2060108@redhat.com>
On Fri, 01 Jun 2012 15:37:55 +0200, Hans de Goede wrote:
> Now that we've a common watchdog core, I would also like to convert the
> fschmd watchdog code to it (one of these days). Which raises the question
> through which tree should that conversion go in. fschmd is primarily a hwmon
> driver, but the changes will only touch the watchdog part...
>
> I guess it would be best to get the conversion in to Wim's tree, even though
> that slightly increases the chance of conflicts. The fschmd driver does not see
> a lot of churn, and I think Wim is a better reviewer for watchdog related
> patches :)
Chances of conflicts are so thin, I vote for getting it through Wim's
watchdog tree.
--
Jean Delvare
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox