* [PATCH v2] netlabel: Fix build problems when IPv6 is not enabled
From: Paul Moore @ 2011-11-29 20:10 UTC (permalink / raw)
To: netdev, rdunlap; +Cc: linux-next, linux-kernel
A recent fix to the the NetLabel code caused build problem with
configurations that did not have IPv6 enabled; see below:
netlabel_kapi.c: In function 'netlbl_cfg_unlbl_map_add':
netlabel_kapi.c:165:4:
error: implicit declaration of function 'netlbl_af6list_add'
This patch fixes this problem by making the IPv6 specific code conditional
on the IPv6 configuration flags as we done in the rest of NetLabel and the
network stack as a whole. We have to move some variable declarations
around as a result so things may not be quite as pretty, but at least it
builds cleanly now.
Some additional IPv6 conditionals were added to the NetLabel code as well
for the sake of consistency.
Reported-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Paul Moore <pmoore@redhat.com>
---
net/netlabel/netlabel_kapi.c | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/net/netlabel/netlabel_kapi.c b/net/netlabel/netlabel_kapi.c
index 3735297..5952237 100644
--- a/net/netlabel/netlabel_kapi.c
+++ b/net/netlabel/netlabel_kapi.c
@@ -111,8 +111,6 @@ int netlbl_cfg_unlbl_map_add(const char *domain,
struct netlbl_domaddr_map *addrmap = NULL;
struct netlbl_domaddr4_map *map4 = NULL;
struct netlbl_domaddr6_map *map6 = NULL;
- const struct in_addr *addr4, *mask4;
- const struct in6_addr *addr6, *mask6;
entry = kzalloc(sizeof(*entry), GFP_ATOMIC);
if (entry == NULL)
@@ -133,9 +131,9 @@ int netlbl_cfg_unlbl_map_add(const char *domain,
INIT_LIST_HEAD(&addrmap->list6);
switch (family) {
- case AF_INET:
- addr4 = addr;
- mask4 = mask;
+ case AF_INET: {
+ const struct in_addr *addr4 = addr;
+ const struct in_addr *mask4 = mask;
map4 = kzalloc(sizeof(*map4), GFP_ATOMIC);
if (map4 == NULL)
goto cfg_unlbl_map_add_failure;
@@ -148,9 +146,11 @@ int netlbl_cfg_unlbl_map_add(const char *domain,
if (ret_val != 0)
goto cfg_unlbl_map_add_failure;
break;
- case AF_INET6:
- addr6 = addr;
- mask6 = mask;
+ }
+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
+ case AF_INET6: {
+ const struct in6_addr *addr6 = addr;
+ const struct in6_addr *mask6 = mask;
map6 = kzalloc(sizeof(*map6), GFP_ATOMIC);
if (map6 == NULL)
goto cfg_unlbl_map_add_failure;
@@ -167,6 +167,8 @@ int netlbl_cfg_unlbl_map_add(const char *domain,
if (ret_val != 0)
goto cfg_unlbl_map_add_failure;
break;
+ }
+#endif /* IPv6 */
default:
goto cfg_unlbl_map_add_failure;
break;
@@ -225,9 +227,11 @@ int netlbl_cfg_unlbl_static_add(struct net *net,
case AF_INET:
addr_len = sizeof(struct in_addr);
break;
+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
case AF_INET6:
addr_len = sizeof(struct in6_addr);
break;
+#endif /* IPv6 */
default:
return -EPFNOSUPPORT;
}
@@ -266,9 +270,11 @@ int netlbl_cfg_unlbl_static_del(struct net *net,
case AF_INET:
addr_len = sizeof(struct in_addr);
break;
+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
case AF_INET6:
addr_len = sizeof(struct in6_addr);
break;
+#endif /* IPv6 */
default:
return -EPFNOSUPPORT;
}
^ permalink raw reply related
* Re: [PATCH v2] netlabel: Fix build problems when IPv6 is not enabled
From: Randy Dunlap @ 2011-11-29 22:00 UTC (permalink / raw)
To: Paul Moore; +Cc: netdev, linux-next, linux-kernel
In-Reply-To: <20111129201054.20141.86401.stgit@sifl>
On 11/29/2011 12:10 PM, Paul Moore wrote:
> A recent fix to the the NetLabel code caused build problem with
> configurations that did not have IPv6 enabled; see below:
>
> netlabel_kapi.c: In function 'netlbl_cfg_unlbl_map_add':
> netlabel_kapi.c:165:4:
> error: implicit declaration of function 'netlbl_af6list_add'
>
> This patch fixes this problem by making the IPv6 specific code conditional
> on the IPv6 configuration flags as we done in the rest of NetLabel and the
> network stack as a whole. We have to move some variable declarations
> around as a result so things may not be quite as pretty, but at least it
> builds cleanly now.
>
> Some additional IPv6 conditionals were added to the NetLabel code as well
> for the sake of consistency.
>
> Reported-by: Randy Dunlap <rdunlap@xenotime.net>
> Signed-off-by: Paul Moore <pmoore@redhat.com>
Acked-by: Randy Dunlap <rdunlap@xenotime.net>
Thanks.
> ---
> net/netlabel/netlabel_kapi.c | 22 ++++++++++++++--------
> 1 files changed, 14 insertions(+), 8 deletions(-)
>
> diff --git a/net/netlabel/netlabel_kapi.c b/net/netlabel/netlabel_kapi.c
> index 3735297..5952237 100644
> --- a/net/netlabel/netlabel_kapi.c
> +++ b/net/netlabel/netlabel_kapi.c
> @@ -111,8 +111,6 @@ int netlbl_cfg_unlbl_map_add(const char *domain,
> struct netlbl_domaddr_map *addrmap = NULL;
> struct netlbl_domaddr4_map *map4 = NULL;
> struct netlbl_domaddr6_map *map6 = NULL;
> - const struct in_addr *addr4, *mask4;
> - const struct in6_addr *addr6, *mask6;
>
> entry = kzalloc(sizeof(*entry), GFP_ATOMIC);
> if (entry == NULL)
> @@ -133,9 +131,9 @@ int netlbl_cfg_unlbl_map_add(const char *domain,
> INIT_LIST_HEAD(&addrmap->list6);
>
> switch (family) {
> - case AF_INET:
> - addr4 = addr;
> - mask4 = mask;
> + case AF_INET: {
> + const struct in_addr *addr4 = addr;
> + const struct in_addr *mask4 = mask;
> map4 = kzalloc(sizeof(*map4), GFP_ATOMIC);
> if (map4 == NULL)
> goto cfg_unlbl_map_add_failure;
> @@ -148,9 +146,11 @@ int netlbl_cfg_unlbl_map_add(const char *domain,
> if (ret_val != 0)
> goto cfg_unlbl_map_add_failure;
> break;
> - case AF_INET6:
> - addr6 = addr;
> - mask6 = mask;
> + }
> +#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
> + case AF_INET6: {
> + const struct in6_addr *addr6 = addr;
> + const struct in6_addr *mask6 = mask;
> map6 = kzalloc(sizeof(*map6), GFP_ATOMIC);
> if (map6 == NULL)
> goto cfg_unlbl_map_add_failure;
> @@ -167,6 +167,8 @@ int netlbl_cfg_unlbl_map_add(const char *domain,
> if (ret_val != 0)
> goto cfg_unlbl_map_add_failure;
> break;
> + }
> +#endif /* IPv6 */
> default:
> goto cfg_unlbl_map_add_failure;
> break;
> @@ -225,9 +227,11 @@ int netlbl_cfg_unlbl_static_add(struct net *net,
> case AF_INET:
> addr_len = sizeof(struct in_addr);
> break;
> +#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
> case AF_INET6:
> addr_len = sizeof(struct in6_addr);
> break;
> +#endif /* IPv6 */
> default:
> return -EPFNOSUPPORT;
> }
> @@ -266,9 +270,11 @@ int netlbl_cfg_unlbl_static_del(struct net *net,
> case AF_INET:
> addr_len = sizeof(struct in_addr);
> break;
> +#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
> case AF_INET6:
> addr_len = sizeof(struct in6_addr);
> break;
> +#endif /* IPv6 */
> default:
> return -EPFNOSUPPORT;
> }
>
--
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
^ permalink raw reply
* Re: git tag expiry?
From: Stephen Rothwell @ 2011-11-29 21:27 UTC (permalink / raw)
To: Joe Perches; +Cc: linux-next
In-Reply-To: <1322590972.15134.5.camel@Joe-Laptop>
[-- Attachment #1: Type: text/plain, Size: 1310 bytes --]
Hi Joe,
On Tue, 29 Nov 2011 10:22:52 -0800 Joe Perches <joe@perches.com> wrote:
>
> In order to keep the next git repository size down,
> are you going to continue to expire and delete older
> next-<date> tags after some number of months/days/weeks?
>
> I think it'd be sensible to keep a maximum of 2 months
> of tags and once a month expire out the oldest tags
> followed by a repack.
Currently, there should be 90 tags in the linux-next tree. This should
easily cover a whole release cycle (and a bit extra). Each day, I remove
the oldest one. Apparently "git gc" is run automatically on kernel.org
every so often. I don;t think that the "git gc" should affect how much
is downloaded (very much), though.
Also, if you fetch the tree, you should only get the latest version as I
also removed the "history" branch that was stiching all the tags
together. So to get an older tag, you need to explicitly fetch it (or
use --tags on the fetch - unless you mirror the tree, in which case you
will get the whole lot). If you fetch each day, you should only be
downloading a few MB ...
The linux-next history tree has all the tags just in case anyone wants an
older one.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: [PATCH v2] netlabel: Fix build problems when IPv6 is not enabled
From: David Miller @ 2011-11-29 21:49 UTC (permalink / raw)
To: rdunlap; +Cc: pmoore, netdev, linux-next, linux-kernel
In-Reply-To: <4ED555E4.4000006@xenotime.net>
From: Randy Dunlap <rdunlap@xenotime.net>
Date: Tue, 29 Nov 2011 14:00:04 -0800
> On 11/29/2011 12:10 PM, Paul Moore wrote:
>> A recent fix to the the NetLabel code caused build problem with
>> configurations that did not have IPv6 enabled; see below:
>>
>> netlabel_kapi.c: In function 'netlbl_cfg_unlbl_map_add':
>> netlabel_kapi.c:165:4:
>> error: implicit declaration of function 'netlbl_af6list_add'
>>
>> This patch fixes this problem by making the IPv6 specific code conditional
>> on the IPv6 configuration flags as we done in the rest of NetLabel and the
>> network stack as a whole. We have to move some variable declarations
>> around as a result so things may not be quite as pretty, but at least it
>> builds cleanly now.
>>
>> Some additional IPv6 conditionals were added to the NetLabel code as well
>> for the sake of consistency.
>>
>> Reported-by: Randy Dunlap <rdunlap@xenotime.net>
>> Signed-off-by: Paul Moore <pmoore@redhat.com>
>
> Acked-by: Randy Dunlap <rdunlap@xenotime.net>
Applied, thanks everyone.
^ permalink raw reply
* Re: linux-next: build failure after merge of the final tree (drm tree related)
From: Stephen Rothwell @ 2011-11-29 22:00 UTC (permalink / raw)
To: Dave Airlie; +Cc: linux-next, linux-kernel, Jesse Barnes
In-Reply-To: <20111129151638.a083e93e21c7917f221af760@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 899 bytes --]
Hi Dave,
On Tue, 29 Nov 2011 15:16:38 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 29 Nov 2011 15:11:10 +1100
> Subject: [PATCH] drm: fix up for BIG ENDIAN breakage
>
> Commit 308e5bcbdb10 ("drm: add an fb creation ioctl that takes a pixel
> format v5") missed one spot needing to be fixed up in the __BIG_ENDIAN
> case.
>
> Fixes build error:
>
> drivers/gpu/drm/radeon/radeon_fb.c: In function 'radeonfb_create_pinned_object':
> drivers/gpu/drm/radeon/radeon_fb.c:144:18: error: 'struct drm_mode_fb_cmd2' has no member named 'bpp'
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Not a biggie, but I noticed that when you added this patch to your tree
you lost the authorship ...
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: merge conflict resolution for pm-freezer
From: Rafael J. Wysocki @ 2011-11-29 22:21 UTC (permalink / raw)
To: Tejun Heo; +Cc: sfr, linux-pm, linux-next
In-Reply-To: <20111128233055.GF3858@google.com>
On Tuesday, November 29, 2011, Tejun Heo wrote:
> Hello, Rafael, Stephen.
>
> Linus just pulled cgroup fixes which conflicts with pm-freezer. The
> resolution is mostly trivial. The cgroup fix changes frozen() test to
> is_task_frozen_enough() while pm-freezer commit prepends "freezing()
> && " to it. They just need to be combined into "freezing() &&
> is_task_frozen_enough()".
>
> The following git branch contains merged branch. I pulled the current
> linus/master a34815b96 "Merge branch 'for-3.2-fixes' of
> git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup" into
> pm-freezer and resolved the conflict described above.
>
> git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc.git pm-freezer-merge
>
> Rafael, please feel free to pull or resolve in any way you see fit.
Well, could you please post a fix patch on top of my pm-freezer branch?
That would be the most convenient way to me. :-)
Thanks,
Rafael
^ permalink raw reply
* Re: ore: FIX breakage when MISC_FILESYSTEMS is not set
From: Boaz Harrosh @ 2011-11-29 22:22 UTC (permalink / raw)
To: Trond Myklebust
Cc: Benny Halevy, Randy Dunlap, Stephen Rothwell,
linux-next-u79uwXL29TY76Z2rM5mHXA, LKML, Michal Marek, NFS list,
open-osd
In-Reply-To: <1322588023.4174.28.camel-SyLVLa/KEI9HwK5hSS5vWB2eb7JE58TQ@public.gmane.org>
On 11/29/2011 09:33 AM, Trond Myklebust wrote:
> On Tue, 2011-11-29 at 14:21 +0200, Benny Halevy wrote:
>> On 2011-11-29 02:13, Boaz Harrosh wrote:
>>>
>>> The solution is to force all users of ORE (exofs, nfs) to manually
>>> select everything auto-magically selected before.
>>
>> How about using "depend ORE" rather than "select ORE"?
>
> Right. Make PNFS_OBJLAYOUT and EXOFS_FS depend on ASYNC_XOR (or select
> it) and then make ORE depend on EXOFS_FS || PNFS_OBJLAYOUT.
>
> There should be no need to add the 'select ORE'...
>
No! guys!
One it will not solve my problem because any
solution that needs to inspect exofs/Kconfig file will
not work if MISC_FILESYSTEMS is not selected and your
solutions involve that.
And two:
All the user needs to do is Select NFS4.1 everything
else should be done automatically. He should not need
to go to misc-filesystems and select ORE so he can have
pnfs-objects. That's a nightmare.
And anyway the current Kernel rule is that a user of a library
needs to select it and all it's dependencies, because select
is not recursive. Now I devised a little skim that can avoid
that, which is not conventional but works very nice. It was
almost good enough only we have the problem that exofs is under
that big MISC_FILESYSTEMS nub.
So It's the regular Kernel way, for now.
(The real solution is to move ORE to lib/ which would enable my
clever trick. But I don't want to go there only because of that)
I'll fix the typos though
Thanks
Heart
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply
* Re: ore: FIX breakage when MISC_FILESYSTEMS is not set
From: Trond Myklebust @ 2011-11-29 22:36 UTC (permalink / raw)
To: Boaz Harrosh
Cc: Benny Halevy, Randy Dunlap, Stephen Rothwell,
linux-next-u79uwXL29TY76Z2rM5mHXA, LKML, Michal Marek, NFS list,
open-osd
In-Reply-To: <4ED55B3B.9050207-C4P08NqkoRlBDgjK7y7TUQ@public.gmane.org>
On Tue, 2011-11-29 at 14:22 -0800, Boaz Harrosh wrote:
> On 11/29/2011 09:33 AM, Trond Myklebust wrote:
> > On Tue, 2011-11-29 at 14:21 +0200, Benny Halevy wrote:
> >> On 2011-11-29 02:13, Boaz Harrosh wrote:
>
> >>>
> >>> The solution is to force all users of ORE (exofs, nfs) to manually
> >>> select everything auto-magically selected before.
> >>
> >> How about using "depend ORE" rather than "select ORE"?
> >
> > Right. Make PNFS_OBJLAYOUT and EXOFS_FS depend on ASYNC_XOR (or select
> > it) and then make ORE depend on EXOFS_FS || PNFS_OBJLAYOUT.
> >
> > There should be no need to add the 'select ORE'...
> >
>
> No! guys!
>
> One it will not solve my problem because any
> solution that needs to inspect exofs/Kconfig file will
> not work if MISC_FILESYSTEMS is not selected and your
> solutions involve that.
Then move ORE _out_ of MISC_FILESYSTEMS. There is no reason why it needs
to be there as long as the things it depends on are there.
> And two:
> All the user needs to do is Select NFS4.1 everything
> else should be done automatically. He should not need
> to go to misc-filesystems and select ORE so he can have
> pnfs-objects. That's a nightmare.
The solution I proposed didn't involve having the user select anything
other than NFSv4.1 and possibly ASYNC_XOR.
> And anyway the current Kernel rule is that a user of a library
> needs to select it and all it's dependencies, because select
> is not recursive. Now I devised a little skim that can avoid
...and this is _my_ nightmare. I dont' _want_ these selects anywhere in
the NFS subsystem.
--
Trond Myklebust
Linux NFS client maintainer
NetApp
Trond.Myklebust-HgOvQuBEEgTQT0dZR+AlfA@public.gmane.org
www.netapp.com
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply
* Re: ore: FIX breakage when MISC_FILESYSTEMS is not set
From: Randy Dunlap @ 2011-11-29 23:39 UTC (permalink / raw)
To: Boaz Harrosh
Cc: Trond Myklebust, Benny Halevy, Stephen Rothwell, linux-next, LKML,
Michal Marek, NFS list, open-osd
In-Reply-To: <4ED55B3B.9050207@panasas.com>
On 11/29/2011 02:22 PM, Boaz Harrosh wrote:
> On 11/29/2011 09:33 AM, Trond Myklebust wrote:
>> On Tue, 2011-11-29 at 14:21 +0200, Benny Halevy wrote:
>>> On 2011-11-29 02:13, Boaz Harrosh wrote:
>
>>>>
>>>> The solution is to force all users of ORE (exofs, nfs) to manually
>>>> select everything auto-magically selected before.
>>>
>>> How about using "depend ORE" rather than "select ORE"?
>>
>> Right. Make PNFS_OBJLAYOUT and EXOFS_FS depend on ASYNC_XOR (or select
>> it) and then make ORE depend on EXOFS_FS || PNFS_OBJLAYOUT.
>>
>> There should be no need to add the 'select ORE'...
>>
>
> No! guys!
>
> One it will not solve my problem because any
> solution that needs to inspect exofs/Kconfig file will
> not work if MISC_FILESYSTEMS is not selected and your
> solutions involve that.
>
> And two:
> All the user needs to do is Select NFS4.1 everything
> else should be done automatically. He should not need
> to go to misc-filesystems and select ORE so he can have
> pnfs-objects. That's a nightmare.
>
> And anyway the current Kernel rule is that a user of a library
> needs to select it and all it's dependencies, because select
> is not recursive. Now I devised a little skim that can avoid
Since 'select' is not recursive, how does the "select ASYNC_XOR"
handle ensuring that what it selects (ASYNC_CORE and XOR_BLOCKS)
have been enabled?
> that, which is not conventional but works very nice. It was
> almost good enough only we have the problem that exofs is under
> that big MISC_FILESYSTEMS nub.
>
> So It's the regular Kernel way, for now.
>
> (The real solution is to move ORE to lib/ which would enable my
> clever trick. But I don't want to go there only because of that)
>
> I'll fix the typos though
With the patch applied, I am still seeing this kconfig warning:
warning: (PNFS_OBJLAYOUT) selects ORE which has unmet direct dependencies (MISC_FILESYSTEMS)
--
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
^ permalink raw reply
* Re: ore: FIX breakage when MISC_FILESYSTEMS is not set
From: Trond Myklebust @ 2011-11-29 22:38 UTC (permalink / raw)
To: Boaz Harrosh
Cc: Benny Halevy, Randy Dunlap, Stephen Rothwell, linux-next, LKML,
Michal Marek, NFS list, open-osd
In-Reply-To: <1322606193.11286.28.camel@lade.trondhjem.org>
On Tue, 2011-11-29 at 17:36 -0500, Trond Myklebust wrote:
> On Tue, 2011-11-29 at 14:22 -0800, Boaz Harrosh wrote:
> > On 11/29/2011 09:33 AM, Trond Myklebust wrote:
> > > On Tue, 2011-11-29 at 14:21 +0200, Benny Halevy wrote:
> > >> On 2011-11-29 02:13, Boaz Harrosh wrote:
> >
> > >>>
> > >>> The solution is to force all users of ORE (exofs, nfs) to manually
> > >>> select everything auto-magically selected before.
> > >>
> > >> How about using "depend ORE" rather than "select ORE"?
> > >
> > > Right. Make PNFS_OBJLAYOUT and EXOFS_FS depend on ASYNC_XOR (or select
> > > it) and then make ORE depend on EXOFS_FS || PNFS_OBJLAYOUT.
> > >
> > > There should be no need to add the 'select ORE'...
> > >
> >
> > No! guys!
> >
> > One it will not solve my problem because any
> > solution that needs to inspect exofs/Kconfig file will
> > not work if MISC_FILESYSTEMS is not selected and your
> > solutions involve that.
>
> Then move ORE _out_ of MISC_FILESYSTEMS. There is no reason why it needs
> to be there as long as the things it depends on are there.
Should read:
There is no reason why ORE needs to depend on MISC_FILESYSTEMS. Only
EXOFS_FS needs that...
> > And two:
> > All the user needs to do is Select NFS4.1 everything
> > else should be done automatically. He should not need
> > to go to misc-filesystems and select ORE so he can have
> > pnfs-objects. That's a nightmare.
>
> The solution I proposed didn't involve having the user select anything
> other than NFSv4.1 and possibly ASYNC_XOR.
>
> > And anyway the current Kernel rule is that a user of a library
> > needs to select it and all it's dependencies, because select
> > is not recursive. Now I devised a little skim that can avoid
>
> ...and this is _my_ nightmare. I dont' _want_ these selects anywhere in
> the NFS subsystem.
^ permalink raw reply
* Re: ore: FIX breakage when MISC_FILESYSTEMS is not set
From: Boaz Harrosh @ 2011-11-29 23:30 UTC (permalink / raw)
To: Randy Dunlap
Cc: Trond Myklebust, Benny Halevy, Stephen Rothwell, linux-next, LKML,
Michal Marek, NFS list, open-osd
In-Reply-To: <4ED56D2E.6050405@xenotime.net>
On 11/29/2011 03:39 PM, Randy Dunlap wrote:
> On 11/29/2011 02:22 PM, Boaz Harrosh wrote:
>> On 11/29/2011 09:33 AM, Trond Myklebust wrote:
>>> On Tue, 2011-11-29 at 14:21 +0200, Benny Halevy wrote:
>>>> On 2011-11-29 02:13, Boaz Harrosh wrote:
>>
>>>>>
>>>>> The solution is to force all users of ORE (exofs, nfs) to manually
>>>>> select everything auto-magically selected before.
>>>>
>>>> How about using "depend ORE" rather than "select ORE"?
>>>
>>> Right. Make PNFS_OBJLAYOUT and EXOFS_FS depend on ASYNC_XOR (or select
>>> it) and then make ORE depend on EXOFS_FS || PNFS_OBJLAYOUT.
>>>
>>> There should be no need to add the 'select ORE'...
>>>
>>
>> No! guys!
>>
>> One it will not solve my problem because any
>> solution that needs to inspect exofs/Kconfig file will
>> not work if MISC_FILESYSTEMS is not selected and your
>> solutions involve that.
>>
>> And two:
>> All the user needs to do is Select NFS4.1 everything
>> else should be done automatically. He should not need
>> to go to misc-filesystems and select ORE so he can have
>> pnfs-objects. That's a nightmare.
>>
>> And anyway the current Kernel rule is that a user of a library
>> needs to select it and all it's dependencies, because select
>> is not recursive. Now I devised a little skim that can avoid
>
> Since 'select' is not recursive, how does the "select ASYNC_XOR"
> handle ensuring that what it selects (ASYNC_CORE and XOR_BLOCKS)
> have been enabled?
>
Not sure why it works than. I looked at config MD_RAID456
and from it's selects I only need ASYNC_XOR.
In later Kernels I will also need the RAID6_** stuff.
>> that, which is not conventional but works very nice. It was
>> almost good enough only we have the problem that exofs is under
>> that big MISC_FILESYSTEMS nub.
>>
>> So It's the regular Kernel way, for now.
>>
>> (The real solution is to move ORE to lib/ which would enable my
>> clever trick. But I don't want to go there only because of that)
>>
>> I'll fix the typos though
>
> With the patch applied, I am still seeing this kconfig warning:
>
> warning: (PNFS_OBJLAYOUT) selects ORE which has unmet direct dependencies (MISC_FILESYSTEMS)
>
OK So I guess I need a much deeper change and move ORE to lib/ or I can do the
below change.
Please advise what you think is the best for now?
Thanks Randy for yur help
---
From: Boaz Harrosh <bharrosh@panasas.com>
Subject: [PATCH] ore: FIX breakage when MISC_FILESYSTEMS is not set
As Reported by Randy Dunlap
When MISC_FILESYSTEMS is not enabled:
fs/built-in.o: In function `objio_alloc_io_state':
objio_osd.c:(.text+0xcb525): undefined reference to `ore_get_rw_state'
fs/built-in.o: In function `_write_done':
objio_osd.c:(.text+0xcb58d): undefined reference to `ore_check_io'
fs/built-in.o: In function `_read_done':
...
When MISC_FILESYSTEMS, which is more of a GUI thing then anything else,
is not selected. exofs/Kconfig is never examined during Kconfig,
and it can not do it's magic stuff to automatically select everything
needed.
We must split exofs/Kconfig in two the ore one is
always included and the exofs one is left in it's
old place in the menu.
Signed-off-by: Boaz Harrosh <bharrosh@panasas.com>
---
fs/Kconfig | 2 ++
fs/exofs/Kconfig | 11 -----------
fs/exofs/ore.Kconfig | 12 ++++++++++++
3 files changed, 14 insertions(+), 11 deletions(-)
create mode 100644 fs/exofs/ore.Kconfig
diff --git a/fs/Kconfig b/fs/Kconfig
index 5f4c45d..fd7bfef 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -218,6 +218,8 @@ source "fs/exofs/Kconfig"
endif # MISC_FILESYSTEMS
+source "fs/exofs/ore.Kconfig"
+
menuconfig NETWORK_FILESYSTEMS
bool "Network File Systems"
default y
diff --git a/fs/exofs/Kconfig b/fs/exofs/Kconfig
index da42f32..86194b2 100644
--- a/fs/exofs/Kconfig
+++ b/fs/exofs/Kconfig
@@ -1,14 +1,3 @@
-# Note ORE needs to "select ASYNC_XOR". So Not to force multiple selects
-# for every ORE user we do it like this. Any user should add itself here
-# at the "depends on EXOFS_FS || ..." with an ||. The dependencies are
-# selected here, and we default to "ON". So in effect it is like been
-# selected by any of the users.
-config ORE
- tristate
- depends on EXOFS_FS || PNFS_OBJLAYOUT
- select ASYNC_XOR
- default SCSI_OSD_ULD
-
config EXOFS_FS
tristate "exofs: OSD based file system support"
depends on SCSI_OSD_ULD
diff --git a/fs/exofs/ore.Kconfig b/fs/exofs/ore.Kconfig
new file mode 100644
index 0000000..1ca7fb7
--- /dev/null
+++ b/fs/exofs/ore.Kconfig
@@ -0,0 +1,12 @@
+# ORE - Objects Raid Engine (libore.ko)
+#
+# Note ORE needs to "select ASYNC_XOR". So Not to force multiple selects
+# for every ORE user we do it like this. Any user should add itself here
+# at the "depends on EXOFS_FS || ..." with an ||. The dependencies are
+# selected here, and we default to "ON". So in effect it is like been
+# selected by any of the users.
+config ORE
+ tristate
+ depends on EXOFS_FS || PNFS_OBJLAYOUT
+ select ASYNC_XOR
+ default SCSI_OSD_ULD
--
1.7.6.4
^ permalink raw reply related
* Re: ore: FIX breakage when MISC_FILESYSTEMS is not set
From: Boaz Harrosh @ 2011-11-29 23:33 UTC (permalink / raw)
To: Trond Myklebust
Cc: Benny Halevy, Randy Dunlap, Stephen Rothwell, linux-next, LKML,
Michal Marek, NFS list, open-osd
In-Reply-To: <1322606322.11286.30.camel@lade.trondhjem.org>
On 11/29/2011 02:38 PM, Trond Myklebust wrote:
> Should read:
> There is no reason why ORE needs to depend on MISC_FILESYSTEMS. Only
> EXOFS_FS needs that...
>
>
OK, thanks
I sent a patch that does that (As reply to Randy).
I'll re-send it as it's own real thing
Thanks
Heart
^ permalink raw reply
* [PATCH v3] ore: FIX breakage when MISC_FILESYSTEMS is not set
From: Boaz Harrosh @ 2011-11-29 23:35 UTC (permalink / raw)
To: Randy Dunlap, Trond Myklebust
Cc: Michal Marek, Stephen Rothwell, NFS list, LKML, Benny Halevy,
linux-next, open-osd
In-Reply-To: <4ED4238F.4090407@panasas.com>
As Reported by Randy Dunlap
When MISC_FILESYSTEMS is not enabled:
fs/built-in.o: In function `objio_alloc_io_state':
objio_osd.c:(.text+0xcb525): undefined reference to `ore_get_rw_state'
fs/built-in.o: In function `_write_done':
objio_osd.c:(.text+0xcb58d): undefined reference to `ore_check_io'
fs/built-in.o: In function `_read_done':
...
When MISC_FILESYSTEMS, which is more of a GUI thing then anything else,
is not selected. exofs/Kconfig is never examined during Kconfig,
and it can not do it's magic stuff to automatically select everything
needed.
We must split exofs/Kconfig in two. The ore one is always included.
And the exofs one is left in it's old place in the menu.
Signed-off-by: Boaz Harrosh <bharrosh@panasas.com>
---
fs/Kconfig | 2 ++
fs/exofs/Kconfig | 11 -----------
fs/exofs/ore.Kconfig | 12 ++++++++++++
3 files changed, 14 insertions(+), 11 deletions(-)
create mode 100644 fs/exofs/ore.Kconfig
diff --git a/fs/Kconfig b/fs/Kconfig
index 5f4c45d..fd7bfef 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -218,6 +218,8 @@ source "fs/exofs/Kconfig"
endif # MISC_FILESYSTEMS
+source "fs/exofs/ore.Kconfig"
+
menuconfig NETWORK_FILESYSTEMS
bool "Network File Systems"
default y
diff --git a/fs/exofs/Kconfig b/fs/exofs/Kconfig
index da42f32..86194b2 100644
--- a/fs/exofs/Kconfig
+++ b/fs/exofs/Kconfig
@@ -1,14 +1,3 @@
-# Note ORE needs to "select ASYNC_XOR". So Not to force multiple selects
-# for every ORE user we do it like this. Any user should add itself here
-# at the "depends on EXOFS_FS || ..." with an ||. The dependencies are
-# selected here, and we default to "ON". So in effect it is like been
-# selected by any of the users.
-config ORE
- tristate
- depends on EXOFS_FS || PNFS_OBJLAYOUT
- select ASYNC_XOR
- default SCSI_OSD_ULD
-
config EXOFS_FS
tristate "exofs: OSD based file system support"
depends on SCSI_OSD_ULD
diff --git a/fs/exofs/ore.Kconfig b/fs/exofs/ore.Kconfig
new file mode 100644
index 0000000..1ca7fb7
--- /dev/null
+++ b/fs/exofs/ore.Kconfig
@@ -0,0 +1,12 @@
+# ORE - Objects Raid Engine (libore.ko)
+#
+# Note ORE needs to "select ASYNC_XOR". So Not to force multiple selects
+# for every ORE user we do it like this. Any user should add itself here
+# at the "depends on EXOFS_FS || ..." with an ||. The dependencies are
+# selected here, and we default to "ON". So in effect it is like been
+# selected by any of the users.
+config ORE
+ tristate
+ depends on EXOFS_FS || PNFS_OBJLAYOUT
+ select ASYNC_XOR
+ default SCSI_OSD_ULD
--
1.7.6.4
^ permalink raw reply related
* Re: [PATCH] at91_ether: use gpio_is_valid for phy IRQ line
From: David Miller @ 2011-11-29 23:53 UTC (permalink / raw)
To: nicolas.ferre
Cc: jamie, netdev, plagnioj, sfr, linux-next, linux-kernel,
linux-arm-kernel
In-Reply-To: <1322169674-4109-1-git-send-email-nicolas.ferre@atmel.com>
From: Nicolas Ferre <nicolas.ferre@atmel.com>
Date: Thu, 24 Nov 2011 22:21:14 +0100
> Use the generic gpiolib gpio_is_valid() function to test
> if the phy IRQ line GPIO is actually provided.
>
> For non-connected or non-existing phy IRQ lines, -EINVAL
> value is used for phy_irq_pin field of struct at91_eth_data.
>
> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
I'm assuming this goes through the ARM tree, because in both of my networking
trees there is no ARM at91 implementation of gpio_is_valid().
^ permalink raw reply
* Re: [osd-dev] [PATCH v3] ore: FIX breakage when MISC_FILESYSTEMS is not set
From: Boaz Harrosh @ 2011-11-30 1:00 UTC (permalink / raw)
To: Randy Dunlap, Trond Myklebust
Cc: Michal Marek, Stephen Rothwell, NFS list, LKML, Benny Halevy,
linux-next, open-osd
In-Reply-To: <4ED56C59.208@panasas.com>
On 11/29/2011 03:35 PM, Boaz Harrosh wrote:
>
> As Reported by Randy Dunlap
>
Randy Hi
I think I prefer this simple solution for now, instead of
the complete move of the ore to lib/
It solves the warning problem you reported and let us
keep the convenience of selecting everything in one place. As
was said there are more dependencies on the way.
I will look into the additional ASYNC_CORE and XOR_BLOCKS selects
you mentioned. For some reason it works but I'll try to find a
way to break it or prove It is sound.
Please advise?
Thanks
Heart
> When MISC_FILESYSTEMS is not enabled:
>
> fs/built-in.o: In function `objio_alloc_io_state':
> objio_osd.c:(.text+0xcb525): undefined reference to `ore_get_rw_state'
> fs/built-in.o: In function `_write_done':
> objio_osd.c:(.text+0xcb58d): undefined reference to `ore_check_io'
> fs/built-in.o: In function `_read_done':
> ...
>
> When MISC_FILESYSTEMS, which is more of a GUI thing then anything else,
> is not selected. exofs/Kconfig is never examined during Kconfig,
> and it can not do it's magic stuff to automatically select everything
> needed.
>
> We must split exofs/Kconfig in two. The ore one is always included.
> And the exofs one is left in it's old place in the menu.
>
> Signed-off-by: Boaz Harrosh <bharrosh@panasas.com>
> ---
> fs/Kconfig | 2 ++
> fs/exofs/Kconfig | 11 -----------
> fs/exofs/ore.Kconfig | 12 ++++++++++++
> 3 files changed, 14 insertions(+), 11 deletions(-)
> create mode 100644 fs/exofs/ore.Kconfig
>
> diff --git a/fs/Kconfig b/fs/Kconfig
> index 5f4c45d..fd7bfef 100644
> --- a/fs/Kconfig
> +++ b/fs/Kconfig
> @@ -218,6 +218,8 @@ source "fs/exofs/Kconfig"
>
> endif # MISC_FILESYSTEMS
>
> +source "fs/exofs/ore.Kconfig"
> +
> menuconfig NETWORK_FILESYSTEMS
> bool "Network File Systems"
> default y
> diff --git a/fs/exofs/Kconfig b/fs/exofs/Kconfig
> index da42f32..86194b2 100644
> --- a/fs/exofs/Kconfig
> +++ b/fs/exofs/Kconfig
> @@ -1,14 +1,3 @@
> -# Note ORE needs to "select ASYNC_XOR". So Not to force multiple selects
> -# for every ORE user we do it like this. Any user should add itself here
> -# at the "depends on EXOFS_FS || ..." with an ||. The dependencies are
> -# selected here, and we default to "ON". So in effect it is like been
> -# selected by any of the users.
> -config ORE
> - tristate
> - depends on EXOFS_FS || PNFS_OBJLAYOUT
> - select ASYNC_XOR
> - default SCSI_OSD_ULD
> -
> config EXOFS_FS
> tristate "exofs: OSD based file system support"
> depends on SCSI_OSD_ULD
> diff --git a/fs/exofs/ore.Kconfig b/fs/exofs/ore.Kconfig
> new file mode 100644
> index 0000000..1ca7fb7
> --- /dev/null
> +++ b/fs/exofs/ore.Kconfig
> @@ -0,0 +1,12 @@
> +# ORE - Objects Raid Engine (libore.ko)
> +#
> +# Note ORE needs to "select ASYNC_XOR". So Not to force multiple selects
> +# for every ORE user we do it like this. Any user should add itself here
> +# at the "depends on EXOFS_FS || ..." with an ||. The dependencies are
> +# selected here, and we default to "ON". So in effect it is like been
> +# selected by any of the users.
> +config ORE
> + tristate
> + depends on EXOFS_FS || PNFS_OBJLAYOUT
> + select ASYNC_XOR
> + default SCSI_OSD_ULD
^ permalink raw reply
* linux-next: build failure after merge of the final tree (akpm tree related)
From: Stephen Rothwell @ 2011-11-30 4:42 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-next, linux-kernel, David Rientjes
[-- Attachment #1: Type: text/plain, Size: 604 bytes --]
Hi Andrew,
After merging the final tree, today's linux-next build (i386 defconfig)
failed like this:
kernel/cpuset.c: In function 'cpuset_change_task_nodemask':
kernel/cpuset.c:971:17: error: 'struct task_struct' has no member named 'mempolicy'
Caused by commit abf5d6d23d83 ("cpusets: stall when updating mems_allowed
for mempolicy or disjoint nodemask") from the akpm tree. The mempolicy
member is only available when CONFIG_NUMA is set.
I have reverted that commit for today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: [PATCH] at91_ether: use gpio_is_valid for phy IRQ line
From: Jean-Christophe PLAGNIOL-VILLARD @ 2011-11-30 4:44 UTC (permalink / raw)
To: David Miller
Cc: nicolas.ferre, jamie, netdev, sfr, linux-next, linux-kernel,
linux-arm-kernel
In-Reply-To: <20111129.185342.105454076866922618.davem@davemloft.net>
On 18:53 Tue 29 Nov , David Miller wrote:
> From: Nicolas Ferre <nicolas.ferre@atmel.com>
> Date: Thu, 24 Nov 2011 22:21:14 +0100
>
> > Use the generic gpiolib gpio_is_valid() function to test
> > if the phy IRQ line GPIO is actually provided.
> >
> > For non-connected or non-existing phy IRQ lines, -EINVAL
> > value is used for phy_irq_pin field of struct at91_eth_data.
> >
> > Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
>
> I'm assuming this goes through the ARM tree, because in both of my networking
> trees there is no ARM at91 implementation of gpio_is_valid().
yes the depending patch series is in the arm-soc
can we have your ack or sob?
Best Regards,
J.
^ permalink raw reply
* linux-next: build failure after merge of the final tree (akpm tree related)
From: Stephen Rothwell @ 2011-11-30 4:52 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 718 bytes --]
Hi Andrew,
After merging the final tree, today's linux-next build (powerpc
allyesconfig) failed like this:
In file included from include/linux/netdevice.h:54:0,
from arch/powerpc/net/bpf_jit_comp.c:14:
include/net/netprio_cgroup.h:34:12: error: 'net_prio_subsys_id' redeclared as different kind of symbol
include/linux/cgroup_subsys.h:71:1: note: previous definition of 'net_prio_subsys_id' was here
And many more similar.
Caused (or exposed) by commit 9222aa56c0ce
("include/net/netprio_cgroup.h: various fixes") from the akpm tree.
I have reverted that commit for today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: Tree for Nov 30
From: Stephen Rothwell @ 2011-11-30 5:03 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 37142 bytes --]
Hi all,
Changes since 20111129:
The hid tree still had its build failure so I used the version from
next-20111128.
The drm tree lost its build failure.
The akpm tree gained two build failures for which I reverted two commits.
----------------------------------------------------------------------------
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 200 trees (counting Linus' and 27 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.
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 (883381d Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4)
Merging fixes/master (aaa0b4f iio: iio_event_getfd -- fix ev_int build failure)
Merging kbuild-current/rc-fixes (44656fa kbuild: Fix missing system calls check on mips.)
Merging arm-current/fixes (fe41db7 ARM: 7177/1: GIC: avoid skipping non-existent PPIs in irq_start calculation)
Merging m68k-current/for-linus (2690e21 m68k/mac: Remove mac_irq_{en,dis}able() wrappers)
Merging powerpc-merge/merge (49e4406 powerpc/44x: Add mtd ndfc to the ppx44x defconfig)
Merging 52xx-and-virtex-current/powerpc/merge (c49f878 dtc/powerpc: remove obsolete .gitignore entries)
Merging sparc/master (0b64120 sparc64: Patch sun4v code sequences properly on module load.)
Merging scsi-rc-fixes/master (e5a44df [SCSI] hpsa: Disable ASPM)
Merging net/master (1281bc2 netlabel: Fix build problems when IPv6 is not enabled)
Merging sound-current/for-linus (ae7cc70 ALSA: usb-audio - Support for Roland GAIA SH-01 Synthesizer)
Merging pci-current/for-linus (4cac2eb PCI hotplug: shpchp: don't blindly claim non-AMD 0x7450 device IDs)
Merging wireless/master (2a1e0fd mac80211: fix race between the AGG SM and the Tx data path)
Merging driver-core.current/driver-core-linus (caca6a0 Linux 3.2-rc3)
Merging tty.current/tty-linus (caca6a0 Linux 3.2-rc3)
Merging usb.current/usb-linus (118205d USB: linux-cdc-acm.inf: add support for the acm_ms gadget)
Merging staging.current/staging-linus (dfd8ee9 Staging: comedi: fix integer overflow in do_insnlist_ioctl())
Merging char-misc.current/char-misc-linus (caca6a0 Linux 3.2-rc3)
Merging cpufreq-current/fixes (eb0b38a [CPUFREQ] db8500: fix build error due to undeclared i variable)
Merging input-current/for-linus (77f6ca5 Input: ams_delta_serio - include linux/module.h)
Merging md-current/for-linus (257a4b4 md/raid5: STRIPE_ACTIVE has lock semantics, add barriers)
Merging audit-current/for-linus (def5754 Audit: remove spaces from audit_log_d_path)
Merging crypto-current/master (2742528 crypto: mv_cesa - fix hashing of chunks > 1920 bytes)
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 (21d41f2 sh: fix the compile error in setup-sh7757.c)
Merging rmobile-current/rmobile-fixes-for-linus (a408bae ARM: mach-shmobile: sh7372 CMT3 and CMT4 clock support)
Merging devicetree-current/devicetree/merge (50e07f8 dt: add empty of_machine_is_compatible)
Merging spi-current/spi/merge (940ab88 drivercore: Add helper macro for platform_driver boilerplate)
Merging arm/for-next (7c4fba6 Merge branch 'devel' into for-next)
Merging arm-lpae/for-next (b0d153e ARM: LPAE: Add the Kconfig entries)
CONFLICT (content): Merge conflict in arch/arm/mm/ioremap.c
CONFLICT (content): Merge conflict in arch/arm/include/asm/tlb.h
CONFLICT (content): Merge conflict in arch/arm/include/asm/pgtable.h
CONFLICT (content): Merge conflict in arch/arm/include/asm/pgalloc.h
Merging arm-soc/for-next (7958e98 Merge branch 'next/timer' into for-next)
CONFLICT (content): Merge conflict in arch/arm/tools/mach-types
CONFLICT (content): Merge conflict in arch/arm/plat-omap/include/plat/common.h
CONFLICT (content): Merge conflict in arch/arm/mach-at91/setup.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/at91sam9rl.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/at91sam9g45.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/at91sam9263.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/at91sam9261.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/at91sam9260.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/at91cap9.c
Merging arm-perf/for-next/perf (f2288ad Merge branches 'perf/fixes', 'perf/event-nos', 'perf/omap4' and 'perf/updates' into for-next/perf)
Merging at91/at91-next (7d28809 usb: at91: fix clk_get error handling)
CONFLICT (content): Merge conflict in arch/arm/mach-at91/setup.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/pm.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/include/mach/system.h
CONFLICT (content): Merge conflict in arch/arm/mach-at91/include/mach/at91sam9rl.h
CONFLICT (content): Merge conflict in arch/arm/mach-at91/include/mach/at91sam9g45.h
CONFLICT (content): Merge conflict in arch/arm/mach-at91/include/mach/at91sam9263.h
CONFLICT (content): Merge conflict in arch/arm/mach-at91/include/mach/at91sam9261.h
CONFLICT (content): Merge conflict in arch/arm/mach-at91/include/mach/at91sam9260.h
CONFLICT (content): Merge conflict in arch/arm/mach-at91/include/mach/at91cap9.h
CONFLICT (content): Merge conflict in arch/arm/mach-at91/gpio.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/generic.h
CONFLICT (content): Merge conflict in arch/arm/mach-at91/at91sam9rl.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/at91sam9g45.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/at91sam9_alt_reset.S
CONFLICT (content): Merge conflict in arch/arm/mach-at91/at91sam926x_time.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/at91sam9263.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/at91sam9261.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/at91sam9260.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/at91cap9.c
Merging davinci/davinci-next (fe0d422 Linux 3.0-rc6)
Merging i.MX/for-next (5788f4d Merge branches 'imx-fixes', 'imx-cleanup' and 'imx-features' into master)
CONFLICT (content): Merge conflict in arch/arm/plat-mxc/include/mach/hardware.h
CONFLICT (modify/delete): arch/arm/mach-mx5/pm-imx5.c deleted in HEAD and modified in i.MX/for-next. Version i.MX/for-next of arch/arm/mach-mx5/pm-imx5.c left in tree.
CONFLICT (modify/delete): arch/arm/mach-mx5/Makefile deleted in HEAD and modified in i.MX/for-next. Version i.MX/for-next of arch/arm/mach-mx5/Makefile left in tree.
CONFLICT (modify/delete): arch/arm/mach-mx5/Kconfig deleted in HEAD and modified in i.MX/for-next. Version i.MX/for-next of arch/arm/mach-mx5/Kconfig left in tree.
CONFLICT (content): Merge conflict in arch/arm/mach-imx/mm-imx5.c
CONFLICT (content): Merge conflict in arch/arm/mach-imx/devices-imx53.h
CONFLICT (content): Merge conflict in arch/arm/mach-imx/clock-mx51-mx53.c
$ git rm -f arch/arm/mach-mx5/pm-imx5.c arch/arm/mach-mx5/Makefile arch/arm/mach-mx5/Kconfig
Merging linux-spec/for-next (5111711 Merge branch 'for-2.6.37' of git://linux-nfs.org/~bfields/linux)
Merging omap/for-next (322a8b0 Linux 3.1-rc1)
Merging pxa/for-next (19d6c13 [ARM] pxa/hx4700: actually use platform_lcd driver)
Merging samsung/next-samsung (9edb240 ARM: H1940/RX1950: Change default LED triggers)
Merging s5p/for-next (a188e1e Merge branch 'next-samsung-devel' into for-next)
CONFLICT (content): Merge conflict in arch/arm/mach-exynos/include/mach/entry-macro.S
CONFLICT (content): Merge conflict in arch/arm/mach-exynos/cpu.c
Merging tegra/for-next (b48c54e Merge branch 'for-3.3/boards' into for-next)
Merging xilinx/arm-next (b85a3ef ARM: Xilinx: Adding Xilinx board support)
Merging blackfin/for-linus (9059054 blackfin: Fixup export.h includes)
Merging c6x/for-linux-next (2141355 C6X: MAINTAINERS)
Merging cris/for-next (ea78f5b CRIS: Update documentation)
Merging quilt/hexagon (110b372 Remove unneeded include of version.h from arch/hexagon/include/asm/spinlock_types.h)
Merging ia64/next (2174f6d pstore: gracefully handle NULL pstore_info functions)
Merging m68k/for-next (2e50d63 m68k: Don't comment out syscalls used by glibc)
Merging m68knommu/for-next (285aa94 m68knommu: fix broken ColdFire slice timer read_clk() code)
CONFLICT (content): Merge conflict in arch/m68k/Kconfig.debug
Merging microblaze/next (7f80850 Merge branch 'rmobile-fixes-for-linus' of git://github.com/pmundt/linux-sh)
Merging mips/mips-for-linux-next (1fc140c Merge branches 'next/ar7', 'next/ath79', 'next/bcm63xx', 'next/bmips', 'next/cavium', 'next/generic', 'next/kprobes', 'next/lantiq', 'next/perf' and 'next/raza' into mips-for-linux-next)
Merging openrisc/for-upstream (b6fd41e Linux 3.1-rc6)
Merging parisc/for-next (fc99a91 futex: Use same lock set as lws calls)
Merging powerpc/next (fa8cbaa powerpc+sparc64/mm: Remove hack in mmap randomize layout)
Merging 4xx/next (9fcd768 powerpc/40x: Remove obsolete HCU4 board)
Merging 52xx-and-virtex/powerpc/next (c1395f4 dtc/powerpc: remove obsolete .gitignore entries)
Merging galak/next (fa8cbaa powerpc+sparc64/mm: Remove hack in mmap randomize layout)
Merging s390/features (4a6f04b [S390] topology: increase poll frequency if change is anticipated)
Merging sh/sh-latest (b9a3acf Merge branch 'sh/stable-updates' into sh-latest)
Merging rmobile/rmobile-latest (b58c580 Merge branch 'rmobile-fixes-for-linus' into rmobile-latest)
Merging sparc-next/master (3ee72ca Merge git://github.com/davem330/net)
Merging tile/master (1583171 Merge branch 'for-linus' of git://github.com/cmetcalf-tilera/linux-tile)
Merging unicore32/unicore32 (ed96dfb unicore32, exec: remove redundant set_fs(USER_DS))
Merging xtensa/master (29aced6 xtensa: remove defining register numbers)
Merging ceph/for-next (3395734 libceph: fix double-free of page vector)
Merging cifs/master (9c32c63 cifs: Fix sparse warning when calling cifs_strtoUCS)
Merging configfs/linux-next (420118c configfs: Rework configfs_depend_item() locking and make lockdep happy)
Merging ecryptfs/next (aaef29d eCryptfs: Flush file in vma close)
Merging ext3/for_next (ed47a7d udf: Cleanup metadata flags handling)
Merging ext4/dev (4c81f04 ext4: fix racy use-after-free in ext4_end_io_dio())
Merging fatfs/master (710d440 fat: fat16 support maximum 4GB file/vol size as WinXP or 7.)
Merging fuse/for-next (cfcfc9e Linux 3.2-rc2)
Merging gfs2/master (018a01c GFS2: We only need one ACL getting function)
Merging hfsplus/for-next (6596528 hfsplus: ensure bio requests are not smaller than the hardware sectors)
Merging jfs/next (1c8007b jfs: flush journal completely before releasing metadata inodes)
Merging logfs/master (21f3eb8 logfs: update page reference count for pined pages)
CONFLICT (content): Merge conflict in fs/logfs/file.c
Merging nfs/linux-next (883381d Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4)
Merging nfsd/nfsd-next (353de31 nfsd4: fix CONFIG_NFSD_FAULT_INJECTION compile error)
Merging nilfs2/for-next (93ee7a9 Linux 3.1-rc2)
Merging ocfs2/linux-next (249ec93 ocfs2: Use filemap_write_and_wait() instead of write_inode_now())
Merging omfs/for-next (976d167 Linux 3.1-rc9)
Merging squashfs/master (7657cac Squashfs: Add an option to set dev block size to 4K)
Merging v9fs/for-next (f8f5ed7 Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4)
Merging ubifs/linux-next (eaecf43 UBIFS: Use kmemdup rather than duplicating its implementation)
Merging xfs/master (4c393a6 xfs: fix attr2 vs large data fork assert)
Merging vfs/for-next (206b1d0 Fix POSIX ACL permission check)
Merging vfs-scale/vfs-scale-working (32385c7 kernel: fix hlist_bl again)
Merging pci/linux-next (cfbf1bd PCI: msi: Disable msi interrupts when we initialize a pci device)
Merging hid/for-next (97c7186 Merge branch 'upstream' into for-next)
$ git reset --hard HEAD^
Merging refs/next/20111128/hid
Merging quilt/i2c (caca6a0 Linux 3.2-rc3)
Merging bjdooks-i2c/next-i2c (f8420b7 fixup merge)
CONFLICT (add/add): Merge conflict in drivers/i2c/busses/i2c-designware-platdrv.c
Merging quilt/jdelvare-hwmon (dda4fa1 hwmon: (lm63) Add support for LM96163)
Merging hwmon-staging/hwmon-next (97c79f2 hwmon: (pmbus/zl6100) Only instantiate external temperature sensor if enabled)
Merging quilt/kernel-doc (c3b92c8 Linux 3.1)
Merging docs/docs-move (5c24d8b Merge branch 'docs/docbook/drm' of git://github.com/mfwitten/linux into docs-move)
Merging v4l-dvb/master (ed3825f Merge branch 'poll-pwc2' of /home/v4l/v4l/patchwork)
CONFLICT (content): Merge conflict in drivers/staging/media/as102/as102_drv.h
Merging kbuild/for-next (ddb550d 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 (3fab0c1 ahci: start engine only during soft/hard resets)
Merging infiniband/for-next (2d122cc Merge branches 'cxgb4', 'ipoib', 'misc' and 'qib' into for-next)
Merging acpi/next (efb9058 Merge branches 'acpi', 'idle', 'mrst-pmu' and 'pm-tools' into next)
Merging cpupowerutils/master (498ca79 cpupower: use man(1) when calling "cpupower help subcommand")
Merging ieee1394/for-next (a572e68 firewire: ohci: fix isochronous DMA synchronization)
Merging ubi/linux-next (93ee7a9 Linux 3.1-rc2)
Merging dlm/next (9beb3bf dlm: convert rsb list to rb_tree)
Merging scsi/master (f7c9c6b [SCSI] Fix block queue and elevator memory leak in scsi_alloc_sdev)
Merging target-updates/for-next (5bda90c target: use ->exectute_task for all CDB emulation)
Merging target-merge/for-next-merge (e0d85e5 ib_srpt: Initial SRP Target merge for v3.2-rc1)
Merging slave-dma/next (02f88be dmaengine: at_hdmac: simplify device selection from platform data or DT)
CONFLICT (content): Merge conflict in drivers/dma/pl330.c
Merging async_tx/next (21ef4b8 dmaengine: use DEFINE_IDR for static initialization)
Merging net-next/master (6977a79 net: Fix skb_update_prio RCU usage.)
Merging wireless-next/master (2648275 iwlwifi: help to debug AGG SM inconsistencies)
Merging bluetooth/master (c6feeb2 Bluetooth: Use queue in the device list)
Merging mtd/master (e0d6511 Merge git://git.infradead.org/mtd-2.6)
Merging l2-mtd/master (63c646f mtd: gpmi: add missing include 'module.h')
Merging crypto/master (8b4d43a crypto: caam - add support for MD5 algorithm variants)
Merging sound/for-next (36c4870 Merge branch 'topic/asoc' into for-next)
Merging sound-asoc/for-next (b00adf7 ASoC: Enhance default WM8958 microphone detection)
Merging cpufreq/next (5aace58 [CPUFREQ] ARM Exynos4210 PM/Suspend compatibility with different bootloaders)
Merging quilt/rr (78173d1 lguest: switch segment-voodoo-numbers to readable symbols)
Merging input/next (a6c6178 Input: remove redundant spi driver bus initialization)
CONFLICT (content): Merge conflict in drivers/input/keyboard/samsung-keypad.c
Merging input-mt/next (02f8c6a Linux 3.0)
Merging lsm/for-next (ca05a99 capabilities: remain source compatible with 32-bit raw legacy capability support.)
Merging block/for-next (5dc34f4 Merge branch 'for-3.3/mtip32xx' into for-next)
Merging quilt/device-mapper (94956ee Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging embedded/master (4744b43 embedded: fix vc_translate operator precedence)
Merging firmware/master (6e03a20 firmware: speed up request_firmware(), v3)
Merging pcmcia/master (74411c0 smc91c92_cs.c: fix bogus compiler warning)
Merging battery/master (00a159a max8925_power: Check at probe time if power to set online)
Merging mmc/mmc-next (ce8fda6 mmc: core: Fix typo at mmc_card_sleep)
Merging kgdb/kgdb-next (880ba69 lib: rename pack_hex_byte() to hex_byte_pack())
Merging slab/for-next (7436099 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 (c7eefaf md/raid1: Mark device replaceable when we see a write error.)
Merging mfd/for-next (b958f7a mfd: Fix missing abx500 header file updates)
Merging hdlc/hdlc-next (4a6908a Linux 2.6.28)
Merging drm/drm-next (248dbc2 drm: move the fb bpp/depth helper into the core.)
Merging fbdev/fbdev-next (64cebcb Merge branch 'fbdev-for-linus' into fbdev-next)
Merging viafb/viafb-next (4ce36bb viafb: replace strict_strtoul to kstrto* and check return value)
Merging omap_dss2/for-next (3e28189 OMAPDSS: picodlp: add missing #include <linux/module.h>)
Merging regulator/for-next (eb29674 regulator: Allow regulators to register with no init_data)
Merging security/next (de35353 digsig: build dependency fix)
CONFLICT (content): Merge conflict in lib/Makefile
Merging selinux/master (ded5098 SELinux: skip file_name_trans_write() when policy downgraded.)
Merging lblnet/master (7e27d6e Linux 2.6.35-rc3)
Merging watchdog/linux-next (3d17ee5 watchdog: add nowayout helpers to Watchdog Timer Driver Kernel API)
Merging bdev/master (feaf384 Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block)
Merging dwmw2-iommu/master (c3b92c8 Linux 3.1)
Merging iommu/next (a7e892e Merge branches 'iommu/fixes', 'iommu/page-sizes' and 'iommu/group-id' into next)
Merging cputime/cputime (c5927fe [S390] cputime: add sparse checking and cleanup)
Merging osd/linux-next (dde406e pnfs-obj: Support for RAID5 read-4-write interface.)
Merging jc_docs/docs-next (5c050fb docs: update the development process document)
Merging nommu/master (0ce790e Linux 2.6.39-rc1)
Merging trivial/for-next (a13b032 clockevents: drop unknown Kconfig symbol GENERIC_CLOCKEVENTS_MIGR)
Merging audit/for-next (def5754 Audit: remove spaces from audit_log_d_path)
Merging pm/linux-next (ca548ac PM / Domains: fix compilation failure for CONFIG_PM_GENERIC_DOMAINS unset)
CONFLICT (content): Merge conflict in kernel/cgroup_freezer.c
Merging apm/for-next (282e5aa x86: Kconfig: drop unknown symbol 'APM_MODULE')
Merging fsnotify/for-next (ef9bf3b fanotify: only destroy a mark if both its mask and its ignored_mask are cleared)
Merging irda/for-next (94d57c4 enic: Update MAINTAINERS)
Merging edac/linux_next (4d096ca MAINTAINERS: add an entry for Edac Sandy Bridge driver)
Merging edac-amd/for-next (1f6189e amd64_edac: Cleanup return type of amd64_determine_edac_cap())
Merging devicetree/devicetree/next (ae97159 of_mdio: Don't phy_scan_fixups() twice)
Merging spi/spi/next (940ab88 drivercore: Add helper macro for platform_driver boilerplate)
Merging gpio/gpio/next (d92ef29 h8300: Move gpio.h to gpio-internal.h)
Merging tip/auto-latest (e79d72b Merge branch 'sched/core' into auto-latest)
CONFLICT (content): Merge conflict in arch/mips/kernel/perf_event_mipsxx.c
Merging rcu/rcu/next (afe24b1 rcu: Move propagation of ->completed from rcu_start_gp() to rcu_report_qs_rsp())
Merging uprobes/for-next (b23a347 x86: skip singlestep where possible)
Merging cgroup/for-next (a34815b Merge branch 'for-3.2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup)
Merging kmemleak/kmemleak (99781ba kmemleak: Add support for memory hotplug)
Merging kvm/kvm-updates/3.2 (a3e06bb KVM: emulate lapic tsc deadline timer for guest)
Merging oprofile/for-next (de346b6 Merge branch 'perf/core' into oprofile/master)
Merging xen/upstream/xen (ec8161f Merge branch 'upstream/microcode' into upstream/xen)
CONFLICT (content): Merge conflict in arch/x86/xen/Kconfig
Merging xen-two/linux-next (306e4b3 Merge branch 'stable/for-linus-3.3' into linux-next)
CONFLICT (content): Merge conflict in arch/x86/xen/Kconfig
Merging xen-pvhvm/linux-next (b056b6a xen: suspend: remove xen_hvm_suspend)
Merging percpu/for-next (a34815b Merge branch 'for-3.2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup)
Merging workqueues/for-next (9c5a2ba workqueue: separate out drain_workqueue() from destroy_workqueue())
Merging sfi/sfi-test (5b026c4 SFI: use ioremap_cache() instead of ioremap())
Merging asm-generic/next (35dbc0e asm-generic/io.h: allow people to override individual funcs)
Merging drivers-x86/linux-next (15b956a acer-wmi: support Lenovo ideapad S205 wifi switch)
Merging hwpoison/hwpoison (46e387b Merge branch 'hwpoison-hugepages' into hwpoison)
Merging sysctl/master (c2f5631 sysctl: remove impossible condition check)
Merging namespace/master (7e05c93 proc: Fix the proc access checks to namespace files.)
Merging regmap/for-next (018690d regmap: Allow regmap_update_bits() users to detect changes)
Merging hsi/for-next (a8b4dea HSI: hsi_char: Update ioctl-number.txt)
Merging driver-core/driver-core-next (11e3123 uio: convert drivers/uio/* to use module_platform_driver())
Merging tty/tty-next (bb74041 TTY: Remove redundant spi driver bus initialization)
CONFLICT (content): Merge conflict in drivers/tty/serial/Makefile
CONFLICT (content): Merge conflict in drivers/tty/serial/Kconfig
Merging usb/usb-next (cc27c96 usb: convert drivers/usb/* to use module_platform_driver())
Merging staging/staging-next (95fa040 staging: hv: move hv_netvsc out of staging area)
CONFLICT (content): Merge conflict in drivers/staging/iio/industrialio-core.c
CONFLICT (content): Merge conflict in drivers/staging/iio/adc/ad799x_core.c
Merging char-misc/char-misc-next (7f3379d misc: ad525x_dpot: Add support for SPI module device table matching)
Merging bkl-config/config (4ba8216 BKL: That's all, folks)
Merging tmem/tmem (665c1e6 mm: cleancache: Use __read_mostly as appropiate.)
CONFLICT (content): Merge conflict in mm/swapfile.c
Merging writeback/writeback-for-next (c37a78e fs: Make write(2) interruptible by SIGKILL)
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 (24118d0 pinctrl: GPIO direction support for muxing)
Merging moduleh/for-sfr (6aec187 drivers/media: video/a5k6aa is a module and so needs module.h)
Merging vhost/linux-next (3216393 sparc: switch to GENERIC_PCI_IOMAP)
CONFLICT (content): Merge conflict in arch/m68k/Kconfig
CONFLICT (content): Merge conflict in arch/hexagon/Kconfig
Merging kvmtool/master (1fbd119 kvm tools: Drop write operation in ro_ops_nowrite)
CONFLICT (content): Merge conflict in scripts/kconfig/Makefile
CONFLICT (content): Merge conflict in include/net/9p/9p.h
Merging scsi-post-merge/merge-base:master ()
$ git checkout akpm
Applying: vmscan: fix initial shrinker size handling
Applying: vmscan: use atomic-long for shrinker batching
Applying: fs/proc/meminfo.c: fix compilation error
Applying: thp: reduce khugepaged freezing latency
Applying: CREDITS: update Kees's expired fingerprint and fix details
Applying: cpusets: stall when updating mems_allowed for mempolicy or disjoint nodemask
Applying: drivers/rtc/rtc-s3c.c: fix driver clock enable/disable balance issues
Applying: memcg: update maintainers
Applying: printk: avoid double lock acquire
Applying: thp: add compound tail page _mapcount when mapped
Applying: thp: set compound tail page _count to zero
Applying: mm/migrate.c: pair unlock_page() and lock_page() when migrating huge pages
Applying: net/netfilter/nf_conntrack_netlink.c: fix Oops on container destroy
Applying: acerhdf: add support for Aspire 1410 BIOS v1.3314
Applying: acerhdf: add support for new hardware
Applying: acerhdf: lowered default temp fanon/fanoff values
Applying: arch/x86/platform/iris/iris.c: register a platform device and a platform driver
Applying: x86: fix mmap random address range
Applying: arch/x86/kernel/e820.c: eliminate bubble sort from sanitize_e820_map
Applying: x86: rtc: don't register a platform RTC device for Intel MID platforms
Applying: arch/x86/kernel/e820.c: quiet sparse noise about plain integer as NULL pointer
Applying: arch/x86/kernel/ptrace.c: quiet sparse noise
Applying: arch/x86/mm/pageattr.c: quiet sparse noise; local functions should be static
Applying: x86: tlb flush avoid superflous leave_mm()
Applying: x86: reduce clock calibration time during slave cpu startup
Applying: x86/paravirt: PTE updates in k(un)map_atomic need to be synchronous, regardless of lazy_mmu mode
Applying: mm/vmalloc.c: eliminate extra loop in pcpu_get_vm_areas error path
Applying: mm-vmallocc-eliminate-extra-loop-in-pcpu_get_vm_areas-error-path-fix
Applying: x86: mpparse: account for bus types other than ISA and PCI
Applying: drivers/platform/x86/sony-laptop.c: fix scancodes
Applying: drivers-platform-x86-sony-laptopc-fix-scancodes-checkpatch-fixes
Applying: arch/arm/mach-ux500/mbox-db5500.c: world-writable sysfs fifo file
Applying: arm, exec: remove redundant set_fs(USER_DS)
Applying: intel-iommu: Fix __init section missmatch of dmar_parse_rmrr_atsr_dev
Applying: hrtimers: Special-case zero length sleeps
Applying: ia64, exec: remove redundant set_fs(USER_DS)
Applying: kconfig: add merge_config.sh script
Applying: merge_config.sh: use signal names compatible with dash and bash
Applying: merge_config.sh: whitespace cleanup
Applying: ipc/mqueue: cleanup definition names and locations
Applying: ipc/mqueue: switch back to using non-max values on create
Applying: ipc/mqueue: enforce hard limits
Applying: ipc/mqueue: update maximums for the mqueue subsystem
Applying: ipc-mqueue-update-maximums-for-the-mqueue-subsystem-fix
Applying: ipc-mqueue-update-maximums-for-the-mqueue-subsystem-checkpatch-fixes
Applying: include/net/netprio_cgroup.h: various fixes
Applying: debugobjects: be smarter about static objects
Applying: debugobjects: extend to assert that an object is initialized
Applying: kernel/timer.c: use debugobjects to catch deletion of uninitialized timers
Applying: ext4: use proper little-endian bitops
Applying: ocfs2: avoid unaligned access to dqc_bitmap
Applying: parisc, exec: remove redundant set_fs(USER_DS)
Applying: scsi: fix a header to include linux/types.h
Applying: drivers/scsi/megaraid.c: fix sparse warnings
Applying: drivers/scsi/aacraid/commctrl.c: fix mem leak in aac_send_raw_srb()
Applying: drivers/scsi/sg.c: convert to kstrtoul_from_user()
Applying: drivers/scsi/mpt2sas/mpt2sas_base.c: fix mismatch in mpt2sas_base_hard_reset_handler() mutex lock-unlock
Applying: drivers/message/fusion/mptbase.c: ensure NUL-termination of MptCallbacksName elements
Applying: fs: remove unneeded plug in mpage_readpages()
Applying: MAINTAINERS: Staging: cx25821: Add L: linux-media
Applying: mm/page-writeback.c: make determine_dirtyable_memory static again
Applying: vmscan: promote shared file mapped pages
Applying: vmscan: activate executable pages after first usage
Applying: mm: add free_hot_cold_page_list() helper
Applying: mm-add-free_hot_cold_page_list-helper-v2
Applying: mm-add-free_hot_cold_page_list-helper-v3
Applying: mm: remove unused pagevec_free
Applying: mm-tracepoint: rename page-free events
Applying: mm-tracepoint: fix documentation and examples
Applying: mm: fix page-faults detection in swap-token logic
Applying: mm: add extra free kbytes tunable
Applying: mm-add-extra-free-kbytes-tunable-update
Applying: mm-add-extra-free-kbytes-tunable-update-checkpatch-fixes
Applying: mm: migrate: one less atomic operation
Applying: mm: do not stall in synchronous compaction for THP allocations
Applying: mm-do-not-stall-in-synchronous-compaction-for-thp-allocations-v3
Applying: mm: reduce the amount of work done when updating min_free_kbytes
Applying: mm-reduce-the-amount-of-work-done-when-updating-min_free_kbytes-checkpatch-fixes
Applying: mm: avoid livelock on !__GFP_FS allocations
Applying: mm: account reaped page cache on inode cache pruning
Applying: hugetlb: detect race upon page allocation failure during COW
Applying: hugetlb: clarify hugetlb_instantiation_mutex usage
Applying: mm/hugetlb.c: fix virtual address handling in hugetlb fault
Applying: mm-hugetlbc-fix-virtual-address-handling-in-hugetlb-fault-fix
Applying: kernel.h: add BUILD_BUG() macro
Applying: kernel.h: Add BUILD_BUG() macro.
Applying: hugetlb: replace BUG() with BUILD_BUG() for dummy definitions
Applying: mm: more intensive memory corruption debugging
Applying: mm-more-intensive-memory-corruption-debug-fix
Applying: PM/Hibernate: do not count debug pages as savable
Applying: slub: min order when debug_guardpage_minorder > 0
Applying: fadvise: only initiate writeback for specified range with FADV_DONTNEED
Applying: mm, debug: test for online nid when allocating on single node
Applying: vmscan: add task name to warn_scan_unevictable() messages
Applying: mm: exclude reserved pages from dirtyable memory
Applying: mm-exclude-reserved-pages-from-dirtyable-memory-fix
Applying: mm: writeback: cleanups in preparation for per-zone dirty limits
Applying: mm: try to distribute dirty pages fairly across zones
Applying: mm: filemap: pass __GFP_WRITE from grab_cache_page_write_begin()
Applying: Btrfs: pass __GFP_WRITE for buffered write page allocations
Applying: mm: compaction: push isolate search base of compact control one pfn ahead
Applying: hpet: factor timer allocate from open
Applying: intel_idle: fix API misuse
Applying: intel_idle: disable auto_demotion for hotplugged CPUs
Applying: kernel.h: neaten panic prototype
Applying: include/linux/linkage.h: remove unused NORET_AND macro
Applying: treewide: remove useless NORET_TYPE macro and uses
Applying: treewide: convert uses of ATTRIB_NORETURN to __noreturn
Applying: treewide-convert-uses-of-attrib_noreturn-to-__noreturn-checkpatch-fixes
Applying: include/linux/linkage.h: remove unused ATTRIB_NORET macro
Applying: mm,slub,x86: decouple size of struct page from CONFIG_CMPXCHG_LOCAL
Applying: mm,x86,um: move CMPXCHG_LOCAL config option
Applying: mm,x86,um: move CMPXCHG_DOUBLE config option
Applying: audit: always follow va_copy() with va_end()
Applying: brlocks/lglocks: clean up code
Applying: brlocks-lglocks-clean-up-code-checkpatch-fixes
Applying: include/log2.h: fix rounddown_pow_of_two(1)
Applying: get_maintainers.pl: follow renames when looking up commit signers
Applying: backlight: remove ADX backlight device support
Applying: leds: convert led platform drivers to module_platform_driver
Applying: leds: convert led i2c drivers to module_i2c_driver
Applying: leds: convert leds-dac124s085 to module_spi_driver
Applying: lib: add GENERIC_PCI_IOMAP
Applying: checkpatch: update signature "might be better as" warning
Applying: checkpatch: prefer __printf over __attribute__((format(printf,...)))
Applying: crc32: optimize inner loop
Applying: epoll: limit paths
Applying: fs: binfmt_elf: create Kconfig variable for PIE randomization
Applying: MIPS: randomize PIE load address
Applying: drivers/rtc/rtc-cmos.c: fix broken NVRAM bank 2 writing
Applying: drivers/rtc/rtc-mxc.c: fix setting time for MX1 SoC
Applying: drivers-rtc-rtc-mxcc-fix-setting-time-for-mx1-soc-fix
Applying: drivers/rtc/rtc-mxc.c: make alarm work
Applying: drivers-rtc-rtc-mxcc-make-alarm-work-fix
Applying: rtc/ab8500: don't disable IRQ:s when suspending
Applying: rtc/ab8500: set can_wake flag
Applying: rtc/ab8500: change to mdelay
Applying: rtc/ab8500: Add calibration attribute to AB8500 RTC
Applying: rtc-ab8500-add-calibration-attribute-to-ab8500-rtc-checkpatch-fixes
Applying: reiserfs: delete comments refering to the BKL
Applying: reiserfs: delay reiserfs lock until journal initialization
Applying: reiserfs: don't lock journal_init()
Applying: reiserfs: don't lock root inode searching
Applying: cgroups: add res_counter_write_u64() API
Applying: cgroups: new resource counter inheritance API
Applying: cgroups: add previous cgroup in can_attach_task/attach_task callbacks
Applying: cgroups: new cancel_attach_task() subsystem callback
Applying: cgroups: ability to stop res charge propagation on bounded ancestor
Applying: cgroups: add res counter common ancestor searching
Applying: res_counter: allow charge failure pointer to be null
Applying: cgroups: pull up res counter charge failure interpretation to caller
Applying: cgroups: allow subsystems to cancel a fork
Applying: cgroups: add a task counter subsystem
Applying: cgroups: ERR_PTR needs err.h
Applying: cgroup: Fix task counter common ancestor logic
Applying: cgroup-fix-task-counter-common-ancestor-logic-checkpatch-fixes
Applying: mm: memcg: consolidate hierarchy iteration primitives
Applying: mm: vmscan: distinguish global reclaim from global LRU scanning
Applying: mm: vmscan: distinguish between memcg triggering reclaim and memcg being scanned
Applying: mm-vmscan-distinguish-between-memcg-triggering-reclaim-and-memcg-being-scanned-checkpatch-fixes
Applying: mm: memcg: per-priority per-zone hierarchy scan generations
Applying: mm: move memcg hierarchy reclaim to generic reclaim code
Applying: mm: memcg: remove optimization of keeping the root_mem_cgroup LRU lists empty
Applying: mm: vmscan: convert global reclaim to per-memcg LRU lists
Applying: mm: collect LRU list heads into struct lruvec
Applying: mm: make per-memcg LRU lists exclusive
Applying: mm: memcg: remove unused node/section info from pc->flags
Applying: mm: memcg: remove unused node/section info from pc->flags fix
Applying: memcg: make mem_cgroup_split_huge_fixup() more efficient
Applying: memcg-make-mem_cgroup_split_huge_fixup-more-efficient-fix
Applying: mm: memcg: shorten preempt-disabled section around event checks
Applying: Documentation/cgroups/memory.txt: fix typo
Applying: memcg: fix pgpgin/pgpgout documentation
Applying: thp: improve the error code path
Applying: thp: remove unnecessary tlb flush for mprotect
Applying: thp: add tlb_remove_pmd_tlb_entry
Applying: thp: improve order in lru list for split huge page
Applying: procfs: make proc_get_link to use dentry instead of inode
Applying: procfs: introduce the /proc/<pid>/map_files/ directory
Applying: procfs-introduce-the-proc-pid-map_files-directory-checkpatch-fixes
Applying: procfs: parse mount options
Applying: procfs: add hidepid= and gid= mount options
Applying: workqueue: make alloc_workqueue() take printf fmt and args for name
Applying: workqueue-make-alloc_workqueue-take-printf-fmt-and-args-for-name-fix
Applying: cpumask: update setup_node_to_cpumask_map() comments
Applying: kexec: remove KMSG_DUMP_KEXEC
Applying: kdump: add missing RAM resource in crash_shrink_memory()
Applying: kdump: add udev events for memory online/offline
Applying: kdump: crashk_res init check for /sys/kernel/kexec_crash_size
Applying: ipc/mqueue: simplify reading msgqueue limit
Applying: ipc/sem.c: alternatives to preempt_disable()
Applying: user namespace: make signal.c respect user namespaces
Applying: __send_signal: pass q->info, not info, to userns_fixup_signal_uid (v2)
Applying: drivers/memstick: use kmemdup rather than duplicating its implementation
Applying: fs/direct-io.c: calculate fs_count correctly in get_more_blocks()
Applying: vfs: cache request_queue in struct block_device
Applying: dio: optimize cache misses in the submission path
Applying: dio-optimize-cache-misses-in-the-submission-path-v2-checkpatch-fixes
Applying: dio: using prefetch requires including prefetch.h
Applying: ramoops: fix use of rounddown_pow_of_two()
Applying: ramoops: update parameters only after successful init
Applying: unlzo: Fix input buffer free
Merging akpm (8fd3cfd unlzo: Fix input buffer free)
[master f9f51f1] Revert "cpusets: stall when updating mems_allowed for mempolicy or disjoint nodemask"
[master 3265b7b] Revert "include/net/netprio_cgroup.h: various fixes"
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: linux-next: build failure after merge of the final tree (akpm tree related)
From: Andrew Morton @ 2011-11-30 5:16 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, David Rientjes
In-Reply-To: <20111130154231.42db05b2eb2baa11f3e7c561@canb.auug.org.au>
On Wed, 30 Nov 2011 15:42:31 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Andrew,
>
> After merging the final tree, today's linux-next build (i386 defconfig)
> failed like this:
>
> kernel/cpuset.c: In function 'cpuset_change_task_nodemask':
> kernel/cpuset.c:971:17: error: 'struct task_struct' has no member named 'mempolicy'
>
> Caused by commit abf5d6d23d83 ("cpusets: stall when updating mems_allowed
> for mempolicy or disjoint nodemask") from the akpm tree. The mempolicy
> member is only available when CONFIG_NUMA is set.
>
This obviously can be hacked around, but one wonders whether we really
need to include things like cpuset_change_task_nodemask() in a
CONFIG_NUMA=n vmlinux?
^ permalink raw reply
* Re: linux-next: build failure after merge of the final tree (akpm tree related)
From: David Miller @ 2011-11-30 5:40 UTC (permalink / raw)
To: sfr; +Cc: akpm, linux-next, linux-kernel
In-Reply-To: <20111130155226.b571cfd7887f03f9e8e1285b@canb.auug.org.au>
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 30 Nov 2011 15:52:26 +1100
> And many more similar.
>
> Caused (or exposed) by commit 9222aa56c0ce
> ("include/net/netprio_cgroup.h: various fixes") from the akpm tree.
>
> I have reverted that commit for today.
Andrew, please submit networking bug fixes to the networking maintainers
in order to avoid problems like this in the future.
Unlike other subsystems, I guarentee to handle it within 24 hours, often
much faster.
Thanks.
^ permalink raw reply
* Re: [PATCH] at91_ether: use gpio_is_valid for phy IRQ line
From: David Miller @ 2011-11-30 5:40 UTC (permalink / raw)
To: plagnioj
Cc: nicolas.ferre, jamie, netdev, sfr, linux-next, linux-kernel,
linux-arm-kernel
In-Reply-To: <20111130044403.GY15008@game.jcrosoft.org>
From: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Date: Wed, 30 Nov 2011 05:44:03 +0100
> On 18:53 Tue 29 Nov , David Miller wrote:
>> From: Nicolas Ferre <nicolas.ferre@atmel.com>
>> Date: Thu, 24 Nov 2011 22:21:14 +0100
>>
>> > Use the generic gpiolib gpio_is_valid() function to test
>> > if the phy IRQ line GPIO is actually provided.
>> >
>> > For non-connected or non-existing phy IRQ lines, -EINVAL
>> > value is used for phy_irq_pin field of struct at91_eth_data.
>> >
>> > Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
>>
>> I'm assuming this goes through the ARM tree, because in both of my networking
>> trees there is no ARM at91 implementation of gpio_is_valid().
> yes the depending patch series is in the arm-soc
>
> can we have your ack or sob?
Acked-by: David S. Miller <davem@davemloft.net>
^ permalink raw reply
* Re: linux-next: build failure after merge of the final tree (akpm tree related)
From: Andrew Morton @ 2011-11-30 6:07 UTC (permalink / raw)
To: David Miller; +Cc: sfr, linux-next, linux-kernel, Neil Horman
In-Reply-To: <20111130.004010.1075431174091251814.davem@davemloft.net>
On Wed, 30 Nov 2011 00:40:10 -0500 (EST) David Miller <davem@davemloft.net> wrote:
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Wed, 30 Nov 2011 15:52:26 +1100
>
> > And many more similar.
> >
> > Caused (or exposed) by commit 9222aa56c0ce
> > ("include/net/netprio_cgroup.h: various fixes") from the akpm tree.
> >
> > I have reverted that commit for today.
>
> Andrew, please submit networking bug fixes to the networking maintainers
> in order to avoid problems like this in the future.
>
> Unlike other subsystems, I guarentee to handle it within 24 hours, often
> much faster.
>
This is my attempt to address the issues I mentioned last week. It is
still under development and doesn't work yet. I thought it did.
I'm now trying to get my brain around what that code is doing with
Kconfig symbols and net_prio_subsys_id. I'm suspecting it's all to
make cgroup-subsys-within-a-module appear to work.
afaict net_prio_subsys_id is an enum if CONFIG_NETPRIO_CGROUP=y and is
an `extern int' when CONFIG_NETPRIO_CGROUP=m. It's unclear to me why
the extern int version or net_prio_subsys_id exists at all, really.
^ permalink raw reply
* Re: linux-next: manual merge of the vhost tree with the hexagon tree
From: Richard Kuo @ 2011-11-30 6:45 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Michael S. Tsirkin, linux-next, linux-kernel
In-Reply-To: <20111129142259.78d3e10678c8e9d8376d52aa@canb.auug.org.au>
On Tue, Nov 29, 2011 at 02:22:59PM +1100, Stephen Rothwell wrote:
> Hi Michael,
>
> Today's linux-next merge of the vhost tree got a conflict in
> arch/hexagon/Kconfig between commit 5237bae0d8c9 ("various Kconfig
> cleanup and old platform build code removal") from the hexagon tree and
> commit4673ca8eb369 ("lib: move GENERIC_IOMAP to lib/Kconfig") from the
> vhost tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.
> --
I was figuring this would happen. What would be the best way for me to
fix this? Maybe rebase my patches on top of the vhost tree?
Thanks,
Richard Kuo
--
Sent by an employee of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
^ permalink raw reply
* Re: [PATCH] crypto: serpent-sse2 - should select CRYPTO_CRYPTD
From: Herbert Xu @ 2011-11-30 8:18 UTC (permalink / raw)
To: Randy Dunlap
Cc: Jussi Kivilinna, Stephen Rothwell, Linux Crypto Mailing List,
linux-next, LKML
In-Reply-To: <4ECE8E71.1080606@xenotime.net>
On Thu, Nov 24, 2011 at 10:35:29AM -0800, Randy Dunlap wrote:
> On 11/23/2011 10:37 PM, Jussi Kivilinna wrote:
> > Since serpent_sse2_glue.c uses cryptd, CRYPTO_SERPENT_SSE2_X86_64 and
> > CRYPTO_SERPENT_SSE2_586 should be selecting CRYPTO_CRYPTD.
> >
> > Reported-by: Randy Dunlap <rdunlap@xenotime.net>
> > Signed-off-by: Jussi Kivilinna <jussi.kivilinna@mbnet.fi>
>
> Acked-by: Randy Dunlap <rdunlap@xenotime.net>
Patch applied. Thanks
--
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
^ 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