* Re: HSI framework for linux-next
From: Sebastian Reichel @ 2011-11-23 17:26 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Carlos Chinea, linux-next, linux-kernel,
linux-omap@vger.kernel.org, ext Linus Walleij, peter_henn@gmx.de,
sjur.brandeland@stericsson.com, govindraj.ti@gmail.com,
pawel.szyszuk@stericsson.com
In-Reply-To: <20111109085140.908f89d0e2b8160cc959d67c@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1056 bytes --]
On Wed, Nov 09, 2011 at 08:51:40AM +1100, Stephen Rothwell wrote:
> Hi Carlos,
>
> On Fri, 28 Oct 2011 12:27:46 +0300 Carlos Chinea <carlos.chinea@nokia.com> wrote:
> > ...
>
> Right, so -rc1 has been released so I can consider this. Just a couple of things:
>
> Linus (and the rest of us) is being a bit nmore paranoid about
> where to fetch trees from. Public git hosters (like gitorious) can be
> problematic since it is hard for us to verify the owners of trees
> reliably. You either need to apply for a kernel.org account, or you will
> need to add a signed tag to your tree before asking Linus to pull from
> it. And that atg will have to be singned with a GPG key that can be
> verified by Linus ...
>
> I am not sure how to translate that gitorious URI above into a
> simple, publically fetchable URI (git://gitorious.org...).
It has been two weeks. Did I miss any status updates?
Here's the git fetchable URI: git://gitorious.org/kernel-hsi/kernel-hsi.git
The existing tag is not signed though.
-- Sebastian
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* regulator tree has moved back to kernel.org
From: Mark Brown @ 2011-11-23 17:16 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Liam Girdwood
Hi Stephen,
Please update the regulator tree in -next to use kernel.org again:
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git for-next
While Liam has his kernel.org account back now he's currently busy
rennovating his house so I'm still looking after the tree and it seems
better to host it on kernel.org.
Thanks,
Mark
^ permalink raw reply
* Re: [PATCH] netprio_cgroup: Fix build break
From: Neil Horman @ 2011-11-23 14:22 UTC (permalink / raw)
To: Kirill Smelkov
Cc: netdev, David S. Miller, john.r.fastabend, robert.w.love,
Stephen Rothwell, linux-next
In-Reply-To: <20111123131147.GA11508@tugrik.mns.mnsspb.ru>
On Wed, Nov 23, 2011 at 05:11:47PM +0400, Kirill Smelkov wrote:
> On Wed, Nov 23, 2011 at 07:32:33AM -0500, Neil Horman wrote:
> > I broke the build with the addition of netprio_cgroups if CONFIG_CGROUPS=n.
> > This patch corrects it by moving the offending struct into an ifdef
> > CONFIG_CGROUPS block. Also clean up a few needless defines and inline functions
> > that don't get called if CONFIG_CGROUPS isn't defined while Im at it.
>
> Thanks Neil, now it compiles ok.
>
Np, sorry for the trouble. I should have double checked that make oldconfig did
what I assumed it did
Neil
^ permalink raw reply
* Re: [PATCH] netprio_cgroup: Fix build break
From: Kirill Smelkov @ 2011-11-23 13:11 UTC (permalink / raw)
To: Neil Horman
Cc: netdev, David S. Miller, john.r.fastabend, robert.w.love,
Stephen Rothwell, linux-next
In-Reply-To: <1322051553-28987-1-git-send-email-nhorman@tuxdriver.com>
On Wed, Nov 23, 2011 at 07:32:33AM -0500, Neil Horman wrote:
> I broke the build with the addition of netprio_cgroups if CONFIG_CGROUPS=n.
> This patch corrects it by moving the offending struct into an ifdef
> CONFIG_CGROUPS block. Also clean up a few needless defines and inline functions
> that don't get called if CONFIG_CGROUPS isn't defined while Im at it.
Thanks Neil, now it compiles ok.
^ permalink raw reply
* [PATCH] netprio_cgroup: Fix build break
From: Neil Horman @ 2011-11-23 12:32 UTC (permalink / raw)
To: netdev
Cc: Neil Horman, Kirill Smelkov, David S. Miller, john.r.fastabend,
robert.w.love, Stephen Rothwell, linux-next
I broke the build with the addition of netprio_cgroups if CONFIG_CGROUPS=n.
This patch corrects it by moving the offending struct into an ifdef
CONFIG_CGROUPS block. Also clean up a few needless defines and inline functions
that don't get called if CONFIG_CGROUPS isn't defined while Im at it.
Signed-off-by: Neil Horman <nhorman@tuxdriver.com>
CC: Kirill Smelkov <kirr@mns.spb.ru>
CC: "David S. Miller" <davem@davemloft.net>
CC: john.r.fastabend@intel.com
CC: robert.w.love@intel.com
CC: Stephen Rothwell <sfr@canb.auug.org.au>
CC: linux-next@vger.kernel.org
---
include/net/netprio_cgroup.h | 18 +++++-------------
1 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/include/net/netprio_cgroup.h b/include/net/netprio_cgroup.h
index c432e99..e503b87 100644
--- a/include/net/netprio_cgroup.h
+++ b/include/net/netprio_cgroup.h
@@ -18,11 +18,6 @@
#include <linux/hardirq.h>
#include <linux/rcupdate.h>
-struct cgroup_netprio_state
-{
- struct cgroup_subsys_state css;
- u32 prioidx;
-};
struct netprio_map {
struct rcu_head rcu;
@@ -32,6 +27,11 @@ struct netprio_map {
#ifdef CONFIG_CGROUPS
+struct cgroup_netprio_state {
+ struct cgroup_subsys_state css;
+ u32 prioidx;
+};
+
#ifndef CONFIG_NETPRIO_CGROUP
extern int net_prio_subsys_id;
#endif
@@ -52,14 +52,6 @@ static inline struct cgroup_netprio_state
#else
#define sock_update_netprioidx(sk)
-#define skb_update_prio(skb)
-
-static inline struct cgroup_netprio_state
- *task_netprio_state(struct task_struct *p)
-{
- return NULL;
-}
-
#endif
#endif /* _NET_CLS_CGROUP_H */
--
1.7.6.4
^ permalink raw reply related
* Re: linux-next: build failure after merge of the final tree (net-next tree related)
From: Neil Horman @ 2011-11-23 12:09 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: David Miller, netdev, linux-next, linux-kernel
In-Reply-To: <20111123150004.59be04eb36c480ec44edc9d5@canb.auug.org.au>
On Wed, Nov 23, 2011 at 03:00:04PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> After merging the final tree, today's linux-next build (powerpc allnoconfig)
> failed like this:
>
> In file included from include/linux/netdevice.h:53:0,
> from include/linux/icmpv6.h:173,
> from include/linux/ipv6.h:220,
> from include/net/ipv6.h:16,
> from include/linux/sunrpc/clnt.h:26,
> from include/linux/nfs_fs.h:50,
> from init/do_mounts.c:20:
> include/net/netprio_cgroup.h:23:29: error: field 'css' has incomplete type
>
> And several more similar.
>
> Caused by commit 5bc1421e34ec ("net: add network priority cgroup
> infrastructure (v4)").
>
> I have added the following (minimal, but probably not optimal) patch for
> today:
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Wed, 23 Nov 2011 14:49:49 +1100
> Subject: [PATCH] net: fix build error in network priority cgroup
> infrastructure
>
> Fixes this error:
>
> In file included from include/linux/netdevice.h:53:0,
> from include/linux/icmpv6.h:173,
> from include/linux/ipv6.h:220,
> from include/net/ipv6.h:16,
> from include/linux/sunrpc/clnt.h:26,
> from include/linux/nfs_fs.h:50,
> from init/do_mounts.c:20:
> include/net/netprio_cgroup.h:23:29: error: field 'css' has incomplete type
>
> When CONFIG_CGROUPS is not set.
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> include/net/netprio_cgroup.h | 2 ++
> 1 files changed, 2 insertions(+), 0 deletions(-)
>
> diff --git a/include/net/netprio_cgroup.h b/include/net/netprio_cgroup.h
> index c432e99..da71b91 100644
> --- a/include/net/netprio_cgroup.h
> +++ b/include/net/netprio_cgroup.h
> @@ -20,7 +20,9 @@
>
> struct cgroup_netprio_state
> {
> +#ifdef CONFIG_CGROUPS
> struct cgroup_subsys_state css;
> +#endif
> u32 prioidx;
> };
>
> --
> 1.7.7.3
>
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
FYI, I've got a more appropriate fix building right now getting posted for the
net-next tree. I'll cc you on it.
Neil
^ permalink raw reply
* Re: linux-next: manual merge of the slave-dma tree with the s5p tree
From: Vinod Koul @ 2011-11-23 11:28 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Thomas Abraham, Kukjin Kim
In-Reply-To: <20111121110837.05684cae0be90d4e7f0df47e@canb.auug.org.au>
On Mon, 2011-11-21 at 11:08 +1100, Stephen Rothwell wrote:
> Hi Vinod,
>
> Today's linux-next merge of the slave-dma tree got a conflict in
> drivers/dma/pl330.c between commit fc0b5cccc8dd ("DMA: PL330: Infer
> transfer direction from transfer request instead of platform data") from
> the s5p tree and commit db8196df4bb6 ("dmaengine: move drivers to
> dma_transfer_direction") from the slave-dma tree.
>
> The former removed the code modified by the latter, so I did that.
Thanks Stephan,
It seems to be the right fix
--
~Vinod
^ permalink raw reply
* Re: linux-next: build failure after merge of the final tree (uprobes tree related)
From: Srikar Dronamraju @ 2011-11-23 10:42 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel
In-Reply-To: <20111123144409.7d1816bef960a2f277aaf1b9@canb.auug.org.au>
> After merging the final tree, today's linux-next build (powerpc
> allnoconfig) failed like this:
>
> In file included from include/linux/mm_types.h:15:0,
> from include/linux/sched.h:64,
> from arch/powerpc/mm/mem.c:21:
> include/linux/uprobes.h:174:49: error: 'struct mm_struct' declared inside parameter list [-Werror]
> include/linux/uprobes.h:174:49: error: its scope is only this definition or declaration, which is probably not what you want [-Werror]
>
> And many more similar.
>
> Caused by commit 61fafad13005 ("uprobes_xol" - "uprobes: slot allocation").
Thanks for reporting this.
I have folded your fix into the patch.
--
Thanks and Regards
Srikar
^ permalink raw reply
* Re: linux-next: build failure after merge of the final tree (uprobes tree related)
From: Srikar Dronamraju @ 2011-11-23 9:54 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel
In-Reply-To: <20111123152854.98c60a7c859f28c2efa30717@canb.auug.org.au>
Hey Stephen,
> After merging the uprobes tree, today's linux-next build (sparc64
> defconfig) failed like this:
>
> In file included from include/linux/mm_types.h:15:0,
> from include/linux/kmemcheck.h:4,
> from include/linux/skbuff.h:18,
> from net/8021q/vlan_core.c:1:
> include/linux/uprobes.h: In function 'register_uprobe':
> include/linux/uprobes.h:148:10: error: 'ENOSYS' undeclared (first use in this function)
>
Oh sorry for missing this.
> And several more.
>
> Caused by commit fb16338b69cd ("register_unregister_uprobe" - "Uprobes:
> register/unregister probes").
>
> I have added this patch for today:
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Wed, 23 Nov 2011 15:11:20 +1100
> Subject: [PATCH] uprobes: using ENOSYS requires errno.h
>
> Fixes this build problem:
>
> In file included from include/linux/mm_types.h:15:0,
> from include/linux/kmemcheck.h:4,
> from include/linux/skbuff.h:18,
> from net/8021q/vlan_core.c:1:
> include/linux/uprobes.h: In function 'register_uprobe':
> include/linux/uprobes.h:148:10: error: 'ENOSYS' undeclared (first use in this function)
>
> when CONFIG_UPROBES is not defined.
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> include/linux/uprobes.h | 1 +
> 1 files changed, 1 insertions(+), 0 deletions(-)
>
> diff --git a/include/linux/uprobes.h b/include/linux/uprobes.h
> index 091dfb8..e2e0674 100644
> --- a/include/linux/uprobes.h
> +++ b/include/linux/uprobes.h
> @@ -23,6 +23,7 @@
> * Jim Keniston
> */
>
> +#include <linux/errno.h>
> #include <linux/rbtree.h>
>
> struct vm_area_struct;
Yes, this is the right fix. So I will fold this into my patch.
--
Thanks and Regards
Srikar
^ permalink raw reply
* Re: [PATCH] dmatest: don't use set_freezable_with_signal()
From: Williams, Dan J @ 2011-11-23 7:48 UTC (permalink / raw)
To: Tejun Heo
Cc: Guennadi Liakhovetski, Stephen Rothwell, rjw, linux-next,
linux-kernel, Vinod Koul, Nicolas Ferre
In-Reply-To: <20111121184316.GH15314@google.com>
On Mon, Nov 21, 2011 at 10:43 AM, Tejun Heo <tj@kernel.org> wrote:
> Commit 981ed70d8e (dmatest: make dmatest threads freezable) made
> dmatest kthread use set_freezable_with_signal(); however, the
> interface is scheduled to be removed in the next merge window.
>
> The problem is that unlike userland tasks there's no default place
> which handles signal pending state and it isn't clear who owns and/or
> is responsible for clearing TIF_SIGPENDING. For example, in the
> current code, try_to_freeze() clears TIF_SIGPENDING but it isn't sure
> whether it actually owns the TIF_SIGPENDING nor is it race-free -
> ie. the task may continue to run with TIF_SIGPENDING set after the
> freezable section.
>
> Unfortunately, we don't have wait_for_completion_freezable_timeout().
> This patch open codes it and uses wait_event_freezable_timeout()
> instead and removes timeout reloading - wait_event_freezable_timeout()
> won't return across freezing events (currently racy but fix scheduled)
> and timer doesn't decrement while the task is in freezer. Although
> this does lose timer-reset-over-freezing, given that timeout is
> supposed to be long enough and failure to finish inside is considered
> irrecoverable, I don't think this is worth the complexity.
>
> While at it, move completion to outer scope and explain that we're
> ignoring dangling pointer problem after timeout. This should give
> slightly better chance at avoiding oops after timeout.
>
> Signed-off-by: Tejun Heo <tj@kernel.org>
> Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
> Cc: Dan Williams <dan.j.williams@intel.com>
> Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
> ---
> Guennadi, Dan, how does this look? If it's okay, do you guys mind
> routing this through pm tree? I have some patches stacked on top
> removal of freezable_with_signal and it would be much easier to route
> these together.
>
> Thank you.
Acked-by: Dan Williams <dan.j.williams@intel.com>
(for the revised commit a75ca055 on
git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc.git pm-freezer)
^ permalink raw reply
* linux-next: Tree for Nov 23
From: Stephen Rothwell @ 2011-11-23 4:44 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 30214 bytes --]
Hi all,
Changes since 20111122:
New trees: arm-perf, uprobes, cgroup.
The drm tree still had its build failure so I used the version from
next-20111115.
The net-next tree gained a conflict against the net tree and a build
failure for which I applied a patch.
The wireless-next tree lost its conflicts and build failure.
The tip tree gained a conflict against the mips tree.
The uprobes tree gained 2 build failures for which I applied patches.
The driver-core tree lost its build failure.
The akpm tree gained a conflict against the net-next tree.
----------------------------------------------------------------------------
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 198 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 (866d43c Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
Merging fixes/master (3155521 Revert "hvc_console: display printk messages on console.")
Merging kbuild-current/rc-fixes (44656fa kbuild: Fix missing system calls check on mips.)
Merging arm-current/fixes (7334c67 Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into fixes)
Merging m68k-current/for-linus (2690e21 m68k/mac: Remove mac_irq_{en,dis}able() wrappers)
Merging powerpc-merge/merge (a313f4c powerpc/signal32: Fix sigset_t conversion when copying to user)
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 (5eccdf5 tc: comment spelling fixes)
Merging sound-current/for-linus (a370fc6 ALSA: hda - fail ELD reading early)
Merging pci-current/for-linus (4cac2eb PCI hotplug: shpchp: don't blindly claim non-AMD 0x7450 device IDs)
Merging wireless/master (82e5fc2 Revert "rt2800pci: handle spurious interrupts")
Merging driver-core.current/driver-core-linus (e25ba0c Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/linux-nfs)
Merging tty.current/tty-linus (e25ba0c Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/linux-nfs)
Merging usb.current/usb-linus (e25ba0c Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/linux-nfs)
Merging staging.current/staging-linus (e25ba0c Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/linux-nfs)
Merging char-misc.current/char-misc-linus (e25ba0c Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/linux-nfs)
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 (82b7660 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 (3155521 Revert "hvc_console: display printk messages on console.")
Merging arm-perf/for-next/perf (90aec28 Merge branches 'perf/fixes', 'perf/event-nos', 'perf/omap4' and 'perf/updates' into for-next/perf)
Merging at91/at91-next (de21d1d ARM: at91: pm_slowclock rename register to named define)
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 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 (content): Merge conflict in arch/arm/mach-mx5/mm.c
CONFLICT (content): Merge conflict in arch/arm/mach-mx5/devices-imx53.h
CONFLICT (content): Merge conflict in arch/arm/mach-mx5/clock-mx51-mx53.c
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 (9e9ceea m68k: Don't comment out syscalls used by glibc)
Merging m68knommu/for-next (27f8c15 m68knommu: fix ColdFire slice timer to handle clock counter wrapping)
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 (7564ded 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 (96cc017 powerpc/p3060qds: Add support for P3060QDS board)
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 (4022ded powerpc/85xx: Update SRIO device tree nodes)
Merging s390/features (100683e [S390] topology: cleanup z10 topology handling)
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 (6e58ad6 ext4: fix up a undefined error in ext4_free_blocks in debugging code)
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 (6a8099e GFS2: Fix multi-block allocation)
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 (011a85a logfs: Prevent memory corruption)
CONFLICT (content): Merge conflict in fs/logfs/file.c
Merging nfs/linux-next (866d43c Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
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 (c889132 MAINTAINERS: update XFS maintainer entry)
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 (1f9d9f5 Merge branch 'upstream' into for-next)
Merging quilt/i2c (7ed4742 i2c: Delete ANY_I2C_BUS)
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 (3627902 hwmon: (exynos4_tmu) Fix Kconfig dependency)
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 (eeff030 Merge branch 'poll-pwc' 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 (042f36e IB/qib: Don't use schedule_work())
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 (e696643 IMX/DMA : set the DMA direction in the sdma_control())
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 (1f2149c net: remove netdev_alloc_page and use __GFP_COLD)
CONFLICT (content): Merge conflict in net/ipv4/inet_diag.c
Merging wireless-next/master (eb1852b rtlwifi: squash warning in _usb_read_sync)
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 (aab0b1f mtd: ndfc: fix typo in structure dereference)
Merging crypto/master (8b4d43a crypto: caam - add support for MD5 algorithm variants)
Merging sound/for-next (e119d77 Merge branch 'topic/asoc' into for-next)
Merging sound-asoc/for-next (a5cf806 Merge branch 'for-3.2' into for-3.3)
Merging cpufreq/next (5aace58 [CPUFREQ] ARM Exynos4210 PM/Suspend compatibility with different bootloaders)
Merging quilt/rr (7c9d1cc lguest: switch segment-voodoo-numbers to readable symbols)
Merging input/next (3d95fd6 Input: elantech - add resolution query support for v4 hardware)
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 (747af4c Merge branch 'for-linus' 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 (85b5fbf power_supply: Fix sysfs format warning)
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 (3bd3e0c 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 (08aa3fe Merge branch 'drm-plane-jbarnes' into drm-core-next)
$ git reset --hard HEAD^
Merging refs/next/20111115/drm
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 (a92460d regulator: Don't create voltage sysfs entries if we can't read voltage)
Merging security/next (de35353 digsig: build dependency fix)
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 (20403e8 watchdog: fix initialisation printout in s3c2410_wdt)
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 (7e0ea2e sound: Kconfig: drop unknown symbol ARCH_CLPS7500)
Merging audit/for-next (def5754 Audit: remove spaces from audit_log_d_path)
Merging pm/linux-next (ee000ac PM / Hibernate: Refactor and simplify hibernation_snapshot() code)
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/inode_uprobes_v32rc2 (f4203dc x86_skip_nop)
Merging cgroup/for-next (41dfa07 cgroup_freezer: fix freezing groups with stopped tasks)
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 (a855b84 percpu: fix chunk range calculation)
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 (cce585c regmap: Fix rbtreee build when not using debugfs)
Merging driver-core/driver-core-next (03e099f debugfs: bugfix: include <linux/io.h> in file.c)
Merging tty/tty-next (161e773 UART: add CSR SiRFprimaII SoC on-chip uart drivers)
CONFLICT (content): Merge conflict in drivers/tty/tty_ldisc.c
CONFLICT (content): Merge conflict in drivers/tty/serial/Makefile
CONFLICT (content): Merge conflict in drivers/tty/serial/Kconfig
Merging usb/usb-next (3af5154 usb: Netlogic: Use CPU_XLR in place of NLM_XLR)
Merging staging/staging-next (cfcfc9e Linux 3.2-rc2)
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 kvmtool/master (e1b4024 kvm tools: Add event idx support to virtio-blk)
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: 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: mrst: battery fixes
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: arch/arm/mach-ux500/mbox-db5500.c: world-writable sysfs fifo file
Applying: arm, exec: remove redundant set_fs(USER_DS)
Applying: drivers/edac/mpc85xx_edac.c: fix memory controller compatible for edac
Applying: drivers/gpu/vga/vgaarb.c: add missing kfree
Applying: drm: avoid switching to text console if there is no panic timeout
Applying: hrtimers: Special-case zero length sleeps
Applying: ia64, exec: remove redundant set_fs(USER_DS)
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: 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: 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: avoid livelock on !__GFP_FS allocations
Applying: mm-avoid-livelock-on-__gfp_fs-allocations-fix
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: thp: reduce khugepaged freezing latency
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: get_maintainers.pl: follow renames when looking up commit signers
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: 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
CONFLICT (content): Merge conflict in include/linux/cgroup_subsys.h
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: 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: 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: kdump: add missing RAM resource in crash_shrink_memory()
Applying: kdump: fix crash_kexec()/smp_send_stop() race in panic
Applying: kdump: Add udev events for memory online/offline
Applying: ipc/mqueue: simplify reading msgqueue limit
Applying: ipc/sem.c: alternatives to preempt_disable()
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: update parameters only after successful init
Merging akpm (9f4a936 ramoops: update parameters only after successful init)
Applying: uprobes: declare mm_struct before its use in uprobes.h
Applying: net: fix build error in network priority cgroup infrastructure
Applying: uprobes: using ENOSYS requires errno.h
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: build failure after merge of the final tree (uprobes tree related)
From: Stephen Rothwell @ 2011-11-23 4:28 UTC (permalink / raw)
To: Srikar Dronamraju; +Cc: linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 1718 bytes --]
Hi Srikar,
After merging the uprobes tree, today's linux-next build (sparc64
defconfig) failed like this:
In file included from include/linux/mm_types.h:15:0,
from include/linux/kmemcheck.h:4,
from include/linux/skbuff.h:18,
from net/8021q/vlan_core.c:1:
include/linux/uprobes.h: In function 'register_uprobe':
include/linux/uprobes.h:148:10: error: 'ENOSYS' undeclared (first use in this function)
And several more.
Caused by commit fb16338b69cd ("register_unregister_uprobe" - "Uprobes:
register/unregister probes").
I have added this patch for today:
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 23 Nov 2011 15:11:20 +1100
Subject: [PATCH] uprobes: using ENOSYS requires errno.h
Fixes this build problem:
In file included from include/linux/mm_types.h:15:0,
from include/linux/kmemcheck.h:4,
from include/linux/skbuff.h:18,
from net/8021q/vlan_core.c:1:
include/linux/uprobes.h: In function 'register_uprobe':
include/linux/uprobes.h:148:10: error: 'ENOSYS' undeclared (first use in this function)
when CONFIG_UPROBES is not defined.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
include/linux/uprobes.h | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/include/linux/uprobes.h b/include/linux/uprobes.h
index 091dfb8..e2e0674 100644
--- a/include/linux/uprobes.h
+++ b/include/linux/uprobes.h
@@ -23,6 +23,7 @@
* Jim Keniston
*/
+#include <linux/errno.h>
#include <linux/rbtree.h>
struct vm_area_struct;
--
1.7.7.3
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply related
* linux-next: build failure after merge of the final tree (net-next tree related)
From: Stephen Rothwell @ 2011-11-23 4:00 UTC (permalink / raw)
To: David Miller, netdev; +Cc: linux-next, linux-kernel, Neil Horman
[-- Attachment #1: Type: text/plain, Size: 1966 bytes --]
Hi all,
After merging the final tree, today's linux-next build (powerpc allnoconfig)
failed like this:
In file included from include/linux/netdevice.h:53:0,
from include/linux/icmpv6.h:173,
from include/linux/ipv6.h:220,
from include/net/ipv6.h:16,
from include/linux/sunrpc/clnt.h:26,
from include/linux/nfs_fs.h:50,
from init/do_mounts.c:20:
include/net/netprio_cgroup.h:23:29: error: field 'css' has incomplete type
And several more similar.
Caused by commit 5bc1421e34ec ("net: add network priority cgroup
infrastructure (v4)").
I have added the following (minimal, but probably not optimal) patch for
today:
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 23 Nov 2011 14:49:49 +1100
Subject: [PATCH] net: fix build error in network priority cgroup
infrastructure
Fixes this error:
In file included from include/linux/netdevice.h:53:0,
from include/linux/icmpv6.h:173,
from include/linux/ipv6.h:220,
from include/net/ipv6.h:16,
from include/linux/sunrpc/clnt.h:26,
from include/linux/nfs_fs.h:50,
from init/do_mounts.c:20:
include/net/netprio_cgroup.h:23:29: error: field 'css' has incomplete type
When CONFIG_CGROUPS is not set.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
include/net/netprio_cgroup.h | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/include/net/netprio_cgroup.h b/include/net/netprio_cgroup.h
index c432e99..da71b91 100644
--- a/include/net/netprio_cgroup.h
+++ b/include/net/netprio_cgroup.h
@@ -20,7 +20,9 @@
struct cgroup_netprio_state
{
+#ifdef CONFIG_CGROUPS
struct cgroup_subsys_state css;
+#endif
u32 prioidx;
};
--
1.7.7.3
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply related
* linux-next: build failure after merge of the final tree (uprobes tree related)
From: Stephen Rothwell @ 2011-11-23 3:44 UTC (permalink / raw)
To: Srikar Dronamraju; +Cc: linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 1485 bytes --]
Hi Srikar,
After merging the final tree, today's linux-next build (powerpc
allnoconfig) failed like this:
In file included from include/linux/mm_types.h:15:0,
from include/linux/sched.h:64,
from arch/powerpc/mm/mem.c:21:
include/linux/uprobes.h:174:49: error: 'struct mm_struct' declared inside parameter list [-Werror]
include/linux/uprobes.h:174:49: error: its scope is only this definition or declaration, which is probably not what you want [-Werror]
And many more similar.
Caused by commit 61fafad13005 ("uprobes_xol" - "uprobes: slot allocation").
I have added the following patch for today:
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 23 Nov 2011 14:35:01 +1100
Subject: [PATCH] uprobes: declare mm_struct before its use in uprobes.h
Since there is a circular dependency between uprobes.h and mm_type.h
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
include/linux/uprobes.h | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/include/linux/uprobes.h b/include/linux/uprobes.h
index 20bdd0a..091dfb8 100644
--- a/include/linux/uprobes.h
+++ b/include/linux/uprobes.h
@@ -26,6 +26,7 @@
#include <linux/rbtree.h>
struct vm_area_struct;
+struct mm_struct;
#ifdef CONFIG_ARCH_SUPPORTS_UPROBES
#include <asm/uprobes.h>
#else
--
1.7.7.3
--
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 related
* Re: linux-next: manual merge of the akpm tree with the net-next tree
From: Neil Horman @ 2011-11-23 3:40 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Andrew Morton, linux-next, linux-kernel, Frederic Weisbecker,
David Miller, netdev
In-Reply-To: <20111123142742.9b4fb79fd3748325753a896a@canb.auug.org.au>
On Wed, Nov 23, 2011 at 02:27:42PM +1100, Stephen Rothwell wrote:
> Hi Andrew,
>
> Today's linux-next merge of the akpm got a conflict in
> include/linux/cgroup_subsys.h between commit 5bc1421e34ec ("net: add
> network priority cgroup infrastructure (v4)") from the net-next tree and
> commit 22a20a26f21c ("cgroups: add a task counter subsystem") from the
> akpm tree.
>
> Just overlapping additions. I fixed it up (see below) and can carry the
> fix as necessary.
ACK, thanks Stephen.
Neil
^ permalink raw reply
* linux-next: manual merge of the akpm tree with the net-next tree
From: Stephen Rothwell @ 2011-11-23 3:27 UTC (permalink / raw)
To: Andrew Morton
Cc: linux-next, linux-kernel, Neil Horman, Frederic Weisbecker,
David Miller, netdev
[-- Attachment #1: Type: text/plain, Size: 827 bytes --]
Hi Andrew,
Today's linux-next merge of the akpm got a conflict in
include/linux/cgroup_subsys.h between commit 5bc1421e34ec ("net: add
network priority cgroup infrastructure (v4)") from the net-next tree and
commit 22a20a26f21c ("cgroups: add a task counter subsystem") from the
akpm tree.
Just overlapping additions. I fixed it up (see below) and can carry the
fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc include/linux/cgroup_subsys.h
index 0bd390c,5425822..0000000
--- a/include/linux/cgroup_subsys.h
+++ b/include/linux/cgroup_subsys.h
@@@ -67,8 -67,8 +67,14 @@@ SUBSYS(perf
/* */
+#ifdef CONFIG_NETPRIO_CGROUP
+SUBSYS(net_prio)
+#endif
+
+/* */
++
+ #ifdef CONFIG_CGROUP_TASK_COUNTER
+ SUBSYS(tasks)
+ #endif
+
+ /* */
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: linux-next: manual merge of the tip tree with the mips tree
From: Deng-Cheng Zhu @ 2011-11-23 2:07 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra,
linux-next, linux-kernel, Ralf Baechle
In-Reply-To: <20111123130148.2a437aabdf6120e7e9b6928c@canb.auug.org.au>
On 11/23/2011 10:01 AM, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the tip tree got a conflict in
> arch/mips/kernel/perf_event_mipsxx.c between commit f40c522a4216
> ("MIPS/Perf-events: Remove erroneous check on active_events") and
> c481e48d9478 ("MIPS/Perf-events: Remove pmu and event state checking in
> validate_event()") from the mips tree and commit aa2bc1ade590 ("perf:
> Don't use -ENOSPC for out of PMU resources") from the tip tree.
>
> Just context changes (and one hunk was removed). I fixed it up (see
> below) and can carry the fix as necessary.
Yes, I was aware of this conflict while writing that patch series based
on linux-mips tree. Your changes look good to me. Thanks for the fixup!
Deng-Cheng
^ permalink raw reply
* linux-next: manual merge of the tip tree with the mips tree
From: Stephen Rothwell @ 2011-11-23 2:01 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra
Cc: linux-next, linux-kernel, Deng-Cheng Zhu, Ralf Baechle
[-- Attachment #1: Type: text/plain, Size: 1460 bytes --]
Hi all,
Today's linux-next merge of the tip tree got a conflict in
arch/mips/kernel/perf_event_mipsxx.c between commit f40c522a4216
("MIPS/Perf-events: Remove erroneous check on active_events") and
c481e48d9478 ("MIPS/Perf-events: Remove pmu and event state checking in
validate_event()") from the mips tree and commit aa2bc1ade590 ("perf:
Don't use -ENOSPC for out of PMU resources") from the tip tree.
Just context changes (and one hunk was removed). I fixed it up (see
below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/mips/kernel/perf_event_mipsxx.c
index bda4bc9,315fc0b..0000000
--- a/arch/mips/kernel/perf_event_mipsxx.c
+++ b/arch/mips/kernel/perf_event_mipsxx.c
@@@ -710,16 -731,16 +710,16 @@@ static int validate_group(struct perf_e
memset(&fake_cpuc, 0, sizeof(fake_cpuc));
- if (!validate_event(&fake_cpuc, leader))
+ if (mipsxx_pmu_alloc_counter(&fake_cpuc, &leader->hw) < 0)
- return -ENOSPC;
+ return -EINVAL;
list_for_each_entry(sibling, &leader->sibling_list, group_entry) {
- if (!validate_event(&fake_cpuc, sibling))
+ if (mipsxx_pmu_alloc_counter(&fake_cpuc, &sibling->hw) < 0)
- return -ENOSPC;
+ return -EINVAL;
}
- if (!validate_event(&fake_cpuc, event))
+ if (mipsxx_pmu_alloc_counter(&fake_cpuc, &event->hw) < 0)
- return -ENOSPC;
+ return -EINVAL;
return 0;
}
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: linux-next: manual merge of the net-next tree with the net tree
From: David Miller @ 2011-11-23 0:23 UTC (permalink / raw)
To: sfr; +Cc: netdev, linux-next, linux-kernel, maze, adobriyan
In-Reply-To: <20111123111751.60b1e8ba032f6077fa03ca13@canb.auug.org.au>
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 23 Nov 2011 11:17:51 +1100
> Hi all,
>
> Today's linux-next merge of the net-next tree got a conflict in
> net/ipv4/inet_diag.c between commit 717b6d836646 ("net-netlink: fix diag
> to export IPv4 tos for dual-stack IPv6 sockets") from the net tree and
> commit 4e3fd7a06dc2 ("net: remove ipv6_addr_copy()") from the net-next
> tree.
>
> Just context changes. I fixed it up (see below) can can carry the fix as
> necessary,
Yep, I anticipated this one too, thanks Stephen.
^ permalink raw reply
* linux-next: manual merge of the net-next tree with the net tree
From: Stephen Rothwell @ 2011-11-23 0:17 UTC (permalink / raw)
To: David Miller, netdev
Cc: linux-next, linux-kernel, Maciej Żenczykowski,
Alexey Dobriyan
[-- Attachment #1: Type: text/plain, Size: 1264 bytes --]
Hi all,
Today's linux-next merge of the net-next tree got a conflict in
net/ipv4/inet_diag.c between commit 717b6d836646 ("net-netlink: fix diag
to export IPv4 tos for dual-stack IPv6 sockets") from the net tree and
commit 4e3fd7a06dc2 ("net: remove ipv6_addr_copy()") from the net-next
tree.
Just context changes. I fixed it up (see below) can can carry the fix as
necessary,
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc net/ipv4/inet_diag.c
index ccee270,bbebdec..0000000
--- a/net/ipv4/inet_diag.c
+++ b/net/ipv4/inet_diag.c
@@@ -132,13 -129,10 +132,11 @@@ static int inet_csk_diag_fill(struct so
if (r->idiag_family == AF_INET6) {
const struct ipv6_pinfo *np = inet6_sk(sk);
- *(struct in6_addr *)r->id.idiag_src = np->rcv_saddr;
- *(struct in6_addr *)r->id.idiag_dst = np->daddr;
if (ext & (1 << (INET_DIAG_TCLASS - 1)))
RTA_PUT_U8(skb, INET_DIAG_TCLASS, np->tclass);
+
- ipv6_addr_copy((struct in6_addr *)r->id.idiag_src,
- &np->rcv_saddr);
- ipv6_addr_copy((struct in6_addr *)r->id.idiag_dst,
- &np->daddr);
++ *(struct in6_addr *)r->id.idiag_src = np->rcv_saddr;
++ *(struct in6_addr *)r->id.idiag_dst = np->daddr;
}
#endif
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: linux-next: manual merge of the arm-lpae tree with the arm tree
From: Catalin Marinas @ 2011-11-22 11:05 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Nicolas Pitre, Russell King
In-Reply-To: <20111122120358.aa2cefdcdace9a98acafd4b9@canb.auug.org.au>
Stephen,
On Tue, Nov 22, 2011 at 01:03:58AM +0000, Stephen Rothwell wrote:
> Today's linux-next merge of the arm-lpae tree got a conflict in
> arch/arm/mm/ioremap.c between commit 3afb51f744b6 ("ARM: add generic
> ioremap optimization by reusing static mappings") from the arm tree and
> commit ec93d80c4b07 ("ARM: LPAE: Page table maintenance for the 3-level
> format") from the arm-lpae tree.
>
> I guessed (probably incorrectly) about the fix up (see below). Please
> supply a better fix if necessary.
The fix-up looks correct from an LPAE perspective. I cannot comment on
the correctness of Nicolas' patch, that's to be discussed on the ARM
Linux list.
Thanks.
--
Catalin
^ permalink raw reply
* Re: [PATCH linux-next] iwlegacy: debug.c needs export.h
From: Stephen Rothwell @ 2011-11-22 10:36 UTC (permalink / raw)
To: Stanislaw Gruszka
Cc: John W. Linville, linux-next, linux-kernel, Paul Gortmaker
In-Reply-To: <20111122075933.GC2199@redhat.com>
[-- Attachment #1: Type: text/plain, Size: 1407 bytes --]
Hi Stanislaw,
On Tue, 22 Nov 2011 08:59:34 +0100 Stanislaw Gruszka <sgruszka@redhat.com> wrote:
>
> Fix:
>
> drivers/net/wireless/iwlegacy/debug.c:1395:1: warning: data definition has no type or storage class [enabled by default]
> drivers/net/wireless/iwlegacy/debug.c:1395:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL' [-Wimplicit-int]
> drivers/net/wireless/iwlegacy/debug.c:1395:1: warning: parameter names (without types) in function declaration [enabled by default]
> drivers/net/wireless/iwlegacy/debug.c:1410:1: warning: data definition has no type or storage class [enabled by default]
> drivers/net/wireless/iwlegacy/debug.c:1410:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL' [-Wimplicit-int]
> drivers/net/wireless/iwlegacy/debug.c:1410:1: warning: parameter names (without types) in function declaration [enabled by default]
>
> Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
> Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
> ---
> This is linux-next patch only, in wireless-next we do not have
> include/linux/export.h file.
I will queue this up for as a merge fix in linux-next for tomorrow.
Alternatively, John, you could merge v3.2-rc1 or rc2 into wireless-next
and apply this as a merge fixup.
--
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: linux-next: manual merge of the arm-lpae tree with the arm tree
From: Catalin Marinas @ 2011-11-22 9:58 UTC (permalink / raw)
To: Russell King
Cc: Stephen Rothwell, linux-next@vger.kernel.org,
linux-kernel@vger.kernel.org, Nicolas Pitre
In-Reply-To: <20111122081317.GB22232@flint.arm.linux.org.uk>
On Tue, Nov 22, 2011 at 08:13:17AM +0000, Russell King wrote:
> On Tue, Nov 22, 2011 at 12:03:58PM +1100, Stephen Rothwell wrote:
> > diff --cc arch/arm/mm/ioremap.c
> > index 12c7ad2,d1f78ba..0000000
> > --- a/arch/arm/mm/ioremap.c
> > +++ b/arch/arm/mm/ioremap.c
> > @@@ -194,7 -208,14 +202,8 @@@ void __iomem * __arm_ioremap_pfn_caller
> > */
> > if (pfn >= 0x100000 && (__pfn_to_phys(pfn) & ~SUPERSECTION_MASK))
> > return NULL;
> > + #endif
> >
> > - /*
> > - * Don't allow RAM to be mapped - this causes problems with ARMv6+
> > - */
> > - if (WARN_ON(pfn_valid(pfn)))
> > - return NULL;
> > -
>
> This certainly is not correct - if Catalin's lpae tree is removing this
> then that needs to be fixed.
No, my patch just adds the #endif. The combined diff above means that
WARN_ON line above is only found in my version of ioremap.c (as my patch
doesn't touch that line). The "if (WARN_ON))" block was removed in the
"generic ioremap optimisation" patch and Stephen also removed it in the
resulting ioremap.c after fixing the conflict.
--
Catalin
^ permalink raw reply
* Re: linux-next: manual merge of the arm-lpae tree with the arm tree
From: Catalin Marinas @ 2011-11-22 9:47 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Nicolas Pitre, Russell King
In-Reply-To: <20111122120358.aa2cefdcdace9a98acafd4b9@canb.auug.org.au>
Hi Stephen,
On Tue, Nov 22, 2011 at 01:03:58AM +0000, Stephen Rothwell wrote:
> Today's linux-next merge of the arm-lpae tree got a conflict in
> arch/arm/mm/ioremap.c between commit 3afb51f744b6 ("ARM: add generic
> ioremap optimization by reusing static mappings") from the arm tree and
> commit ec93d80c4b07 ("ARM: LPAE: Page table maintenance for the 3-level
> format") from the arm-lpae tree.
>
> I guessed (probably incorrectly) about the fix up (see below). Please
> supply a better fix if necessary.
Thanks for pointing out. I'll have a look at the conflict and let you
know.
> More generally, is the LPAE stuff going to be merged soon?
Hopefully I get it merged during the upcoming merging window (for
3.3-rc1) but it does not depend only on me.
> The above
> arm-lpae commit dates from February (though it was recommitted on Nov
> 15) ...
Maybe I should do a 'git rebase --ignore-date', it doesn't make much
sense for a reworked patch to still keep the original author date.
--
Catalin
^ permalink raw reply
* Re: linux-next: manual merge of the arm-lpae tree with the arm tree
From: Russell King @ 2011-11-22 8:13 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Catalin Marinas, linux-next, linux-kernel, Nicolas Pitre
In-Reply-To: <20111122120358.aa2cefdcdace9a98acafd4b9@canb.auug.org.au>
On Tue, Nov 22, 2011 at 12:03:58PM +1100, Stephen Rothwell wrote:
> diff --cc arch/arm/mm/ioremap.c
> index 12c7ad2,d1f78ba..0000000
> --- a/arch/arm/mm/ioremap.c
> +++ b/arch/arm/mm/ioremap.c
> @@@ -194,7 -208,14 +202,8 @@@ void __iomem * __arm_ioremap_pfn_caller
> */
> if (pfn >= 0x100000 && (__pfn_to_phys(pfn) & ~SUPERSECTION_MASK))
> return NULL;
> + #endif
>
> - /*
> - * Don't allow RAM to be mapped - this causes problems with ARMv6+
> - */
> - if (WARN_ON(pfn_valid(pfn)))
> - return NULL;
> -
This certainly is not correct - if Catalin's lpae tree is removing this
then that needs to be fixed.
--
Russell King
Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/
maintainer of:
^ 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