* Re: linux-next: build failure after merge of the v9fs tree
From: Joe Perches @ 2011-12-01 16:57 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Eric Van Hensbergen, linux-next, linux-kernel
In-Reply-To: <20111201120215.4320090bef1da653abad3392@canb.auug.org.au>
On Thu, 2011-12-01 at 12:02 +1100, Stephen Rothwell wrote:
> Hi Eric,
>
> After merging the v9fs tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> ERROR: "_p9_debug" [net/9p/9pnet_virtio.ko] undefined!
> ERROR: "_p9_debug" [net/9p/9pnet_rdma.ko] undefined!
> ERROR: "_p9_debug" [net/9p/9pnet.ko] undefined!
>
> Caused by commit be9e4aa9e783 ("9p: Reduce object size with
> CONFIG_NET_9P_DEBUG").
>
> I have used the v9fs tree from next-20111130 for today.
Thanks Stephen.
Clearly I didn't sufficiently compile test this.
Sorry. I'll resubmit.
^ permalink raw reply
* Re: linux-next: manual merge of the trivial tree with the 4xx tree
From: Josh Boyer @ 2011-12-01 15:39 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Jiri Kosina, linux-next, linux-kernel, Tanmay Inamdar, Paul Bolle
In-Reply-To: <20111201131604.fa4e2fe14d5f370924592939@canb.auug.org.au>
On Wed, Nov 30, 2011 at 9:16 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Jiri,
>
> Today's linux-next merge of the trivial tree got a conflict in
> arch/powerpc/platforms/40x/Kconfig between commit d5b9ee7b514e
> ("powerpc/40x: Add APM8018X SOC support") from the 4xx tree and commit
> ff5f483f3091 ("powerpc: 4xx: remove commented out Kconfig entries") from
> the trivial tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.
That seems correct to me. If you don't mind carrying it, I'd appreciate it.
josh
^ permalink raw reply
* Re: linux-next not booting on snowball
From: Daniel Lezcano @ 2011-12-01 15:34 UTC (permalink / raw)
To: Mark Brown
Cc: Nicolas Pitre, Lists Linaro-dev, Stephen Warren, Kevin Hilman,
Jamie Iles, Stephen Rothwell, linux-next
In-Reply-To: <20111201145801.GB2103@sirena.org.uk>
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
On 12/01/2011 03:58 PM, Mark Brown wrote:
> On Thu, Dec 01, 2011 at 03:51:00PM +0100, Daniel Lezcano wrote:
>
>> commit 549158d2ab01e8370d2773044fe09738a26f7086
>> Author: Nicolas Pitre <nicolas.pitre@linaro.org>
>> Date: Thu Aug 25 00:35:59 2011 -0400
>
>> ARM: move iotable mappings within the vmalloc region
>>
>> In order to remove the build time variation between different SOCs
>> with
>> regards to VMALLOC_END, the iotable mappings are now allocated inside
>> the vmalloc region. This allows for VMALLOC_END to be identical
>> across
>> all machines.
>
> I recently reported an issue with this patch on s3c64xx which I'm
> avoiding with the below change, I believe Nicolas folded this in to his
> code but it's not propagated into -next yet.
>
> From d53e2ce3fb18e097678b324932591044eb80c0f1 Mon Sep 17 00:00:00 2001
> From: Mark Brown <broonie@opensource.wolfsonmicro.com>
> Date: Thu, 24 Nov 2011 12:46:04 +0000
> Subject: [PATCH] ARM: Handle empty maps in iotable_init()
>
> Some CPUs (such as the S3C6410) have been relying on being able to call
> iotable_init() with no io_descs in order to simplify passing through
> machine-specific io_descs. The changes in "ARM: move iotable mappings
> within the vmalloc region" broke this by adding an early_alloc_aligned()
> for an array of vm_structs. Fix this by returning early if no descriptors
> have been passed.
>
> I'm not sure if this is the most tasteful fix but it preserves existing
> behaviour and allows boot to proceed on my system.
>
> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
> ---
> arch/arm/mm/mmu.c | 3 +++
> 1 files changed, 3 insertions(+), 0 deletions(-)
>
> diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c
> index 06e2aef..94c5a0c 100644
> --- a/arch/arm/mm/mmu.c
> +++ b/arch/arm/mm/mmu.c
> @@ -763,6 +763,9 @@ void __init iotable_init(struct map_desc *io_desc, int nr)
> struct map_desc *md;
> struct vm_struct *vm;
>
> + if (!nr)
> + return;
> +
> vm = early_alloc_aligned(sizeof(*vm) * nr, __alignof__(*vm));
>
> for (md = io_desc; nr; md++, nr--) {
Thanks for the patch Mark. I applied it and tried to boot but the kernel
is still stuck on the same place :(
- --
<http://www.linaro.org/> Linaro.org ? Open source software for ARM SoCs
Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
iQEcBAEBAgAGBQJO156fAAoJEAKBbMCpUGYAZK4H/iCGIqc7pYPllJbO4b4JU6FB
iTIXCeNrLZIxoqgugTQTru/6ISX/Rc3jjXIXrmu7NRjN5V+C0IzpJzRj5x4X/ysJ
xOU+65pKZ2z9D+BnkXADKYZCM6Zlqnf4qtMFLGHC1Ki1QK6HwMmReYUDEJc/7V3z
b1jXlql88Lgex9iFo73VKHn+ww8E/8OWyeutyTUIw9kvrlVaXQy6mF87rOPtS3gP
HCENMMwtEKUlHPrVBDA/MRQDF0iWKQl0aDKlmJBL3HivoAVlmhr1H6m260dkWo1w
dQUfTG7XbBWN3xg2JQ9Bp2KpTl4VvCyEJl9k0ymlcim00+l+dQySpaeC+LCKkG0=
=x1Qh
-----END PGP SIGNATURE-----
^ permalink raw reply
* Re: linux-next not booting on snowball
From: Mark Brown @ 2011-12-01 14:58 UTC (permalink / raw)
To: Daniel Lezcano
Cc: Nicolas Pitre, Kevin Hilman, Stephen Rothwell,
linux-next-u79uwXL29TY76Z2rM5mHXA, Jamie Iles, Lists Linaro-dev
In-Reply-To: <4ED79454.1090304-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
On Thu, Dec 01, 2011 at 03:51:00PM +0100, Daniel Lezcano wrote:
> commit 549158d2ab01e8370d2773044fe09738a26f7086
> Author: Nicolas Pitre <nicolas.pitre-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
> Date: Thu Aug 25 00:35:59 2011 -0400
> ARM: move iotable mappings within the vmalloc region
>
> In order to remove the build time variation between different SOCs
> with
> regards to VMALLOC_END, the iotable mappings are now allocated inside
> the vmalloc region. This allows for VMALLOC_END to be identical
> across
> all machines.
I recently reported an issue with this patch on s3c64xx which I'm
avoiding with the below change, I believe Nicolas folded this in to his
code but it's not propagated into -next yet.
>From d53e2ce3fb18e097678b324932591044eb80c0f1 Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie-yzvPICuk2AATkU/dhu1WVueM+bqZidxxQQ4Iyu8u01E@public.gmane.org>
Date: Thu, 24 Nov 2011 12:46:04 +0000
Subject: [PATCH] ARM: Handle empty maps in iotable_init()
Some CPUs (such as the S3C6410) have been relying on being able to call
iotable_init() with no io_descs in order to simplify passing through
machine-specific io_descs. The changes in "ARM: move iotable mappings
within the vmalloc region" broke this by adding an early_alloc_aligned()
for an array of vm_structs. Fix this by returning early if no descriptors
have been passed.
I'm not sure if this is the most tasteful fix but it preserves existing
behaviour and allows boot to proceed on my system.
Signed-off-by: Mark Brown <broonie-yzvPICuk2AATkU/dhu1WVueM+bqZidxxQQ4Iyu8u01E@public.gmane.org>
---
arch/arm/mm/mmu.c | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c
index 06e2aef..94c5a0c 100644
--- a/arch/arm/mm/mmu.c
+++ b/arch/arm/mm/mmu.c
@@ -763,6 +763,9 @@ void __init iotable_init(struct map_desc *io_desc, int nr)
struct map_desc *md;
struct vm_struct *vm;
+ if (!nr)
+ return;
+
vm = early_alloc_aligned(sizeof(*vm) * nr, __alignof__(*vm));
for (md = io_desc; nr; md++, nr--) {
--
1.7.7.3
^ permalink raw reply related
* linux-next not booting on snowball
From: Daniel Lezcano @ 2011-12-01 14:51 UTC (permalink / raw)
To: Nicolas Pitre
Cc: Lists Linaro-dev, Stephen Warren, Kevin Hilman, Jamie Iles,
Stephen Rothwell, linux-next
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Hi all,
I am using the linux-next head git tree on a snowball V5.
The kernel hangs at "Uncompressing kernel... done".
After bisecting, the patch where the kernel does no longer boot is:
commit 549158d2ab01e8370d2773044fe09738a26f7086
Author: Nicolas Pitre <nicolas.pitre@linaro.org>
Date: Thu Aug 25 00:35:59 2011 -0400
ARM: move iotable mappings within the vmalloc region
In order to remove the build time variation between different SOCs
with
regards to VMALLOC_END, the iotable mappings are now allocated inside
the vmalloc region. This allows for VMALLOC_END to be identical
across
all machines.
The value for VMALLOC_END is now set to 0xff000000 which is right
where
the consistent DMA area starts.
To accommodate all static mappings on machines with possible
highmem usage,
the default vmalloc area size is changed to 240 MB so that
VMALLOC_START
is no higher than 0xf0000000 by default.
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Tested-by: Stephen Warren <swarren@nvidia.com>
Tested-by: Kevin Hilman <khilman@ti.com>
Tested-by: Jamie Iles <jamie@jamieiles.com>
Is it a known issue ?
kernel config file : http://pastebin.com/E6HngT58
Thanks
-- Daniel
- --
<http://www.linaro.org/> Linaro.org ? Open source software for ARM SoCs
Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
iQEcBAEBAgAGBQJO15RUAAoJEAKBbMCpUGYA+JkIALr9uQl2EgpCuvjo9udAs6LI
dqM1w0BvMpr2WxcMO0pUvqsCKMKBcuWz6sC/BZjCJmpcxT5H8Am6YJTFq4l4y+tO
09Ggt2fK3AUWH6CBlja8HD0MEQkkjv45tiFWS0s6qFdd4MhhII+P9M04kSwaQ24u
PWwCiPofwx2RfYGM7an7VBpTAgqOuIaL5CUJdjDL5wgHsZW/qE5hQVN+V/V47TPq
1M1A9xaBs+3BhU0yTe8JMstaXoGqTgehkE5puFXZ+6f+qhLRJZTRXwu2lHbXCdyf
rcByM65gB3cSfb555DKnXgK7qB4T2n0t/nilkkT1PaO7sM0I9E4O2wdQk5KvtbE=
=RaPn
-----END PGP SIGNATURE-----
^ permalink raw reply
* RE: linux-next: manual merge of the staging tree with the hid tree
From: KY Srinivasan @ 2011-12-01 10:12 UTC (permalink / raw)
To: Greg KH, Stephen Rothwell
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Thomas Meyer, Jiri Kosina
In-Reply-To: <20111201035113.GA7647@kroah.com>
> -----Original Message-----
> From: Greg KH [mailto:greg@kroah.com]
> Sent: Wednesday, November 30, 2011 10:51 PM
> To: Stephen Rothwell
> Cc: linux-next@vger.kernel.org; linux-kernel@vger.kernel.org; KY Srinivasan;
> Thomas Meyer; Jiri Kosina
> Subject: Re: linux-next: manual merge of the staging tree with the hid tree
>
> On Thu, Dec 01, 2011 at 02:39:52PM +1100, Stephen Rothwell wrote:
> > Hi Greg,
> >
> > Today's linux-next merge of the staging tree got a conflict in
> > drivers/hid/hid-hyperv.c between commit b95f5bcb811e ("HID: Move the
> > hid-hyperv driver out of staging") from the hid tree and various commits
> > from the staging tree (this was drivers/staging/hv/hv_mouse.c).
> >
> > The commit message says that all the changes that happened when this file
> > moved from staging have also been applied to the staging file, so I just
> > used the version from the hid tree.
>
> Ok, that's fine, Jiri, want me to just delete the driver from my tree
> now to remove any of these conflicts?
Jiri,
Yesterday (Nov 30th, 2011) I had sent a patch for the mouse driver to fix a bug
that got introduced during the recent cleanup to exit staging. This patch was against
the staging tree that Greg is planning to delete. It is a trivial patch; can you pick this up
for the hid tree. If you prefer, I could rebase the patch against your tree. Let me know.
Regards,
K. Y
^ permalink raw reply
* linux-next: Tree for Dec 1
From: Stephen Rothwell @ 2011-12-01 4:53 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 36081 bytes --]
Hi all,
Changes since 20111130:
The at91 tree lost its conflicts.
The v9fs tree gained a build failure, so I used the version from
next-20111130.
The hid tree lost its build failure.
The trivial tree gained a conflict against the 4xx tree.
The staging tree gained conflicts against the hid tree.
The akpm tree lost one build failure.
----------------------------------------------------------------------------
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 (218fa90 ipv4: fix lockdep splat in rt_cache_seq_show)
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 (c72e8d3 mac80211: fill rate filter for internal scan requests)
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 (6414e94 usb: gadget: fsl_udc: fix dequeuing a request in progress)
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 (8748dfa Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux)
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 (f1ab937 MAINTAINERS: Update PowerPC 4xx git tree)
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 (be9e4aa 9p: Reduce object size with CONFIG_NET_9P_DEBUG)
$ git reset --hard HEAD^
Merging refs/next/20111130/v9fs
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 (2ddfbbc Merge branch 'multitouch' into for-next)
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 (a976c2a 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 (a493f1a 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 (449fa02 sfc: fix race in efx_enqueue_skb_tso())
Merging wireless-next/master (ba5736a ath9k_hw: add default chainmask for AR9462)
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 (741e8c2 crypto: convert drivers/crypto/* to use module_platform_driver())
Merging sound/for-next (ad32d58 Merge branch 'fix/asoc' into for-next)
Merging sound-asoc/for-next (a169134 ASoC: Provide debug log of accessory status on WM8958)
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)
CONFLICT (content): Merge conflict in arch/powerpc/platforms/40x/Kconfig
Merging audit/for-next (def5754 Audit: remove spaces from audit_log_d_path)
Merging pm/linux-next (46fc057 Freezer / NFS: make TASK_KILLABLE sleeps attempt to freeze)
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 (ed8ccfa Merge branch '3.3-edac-scrubrate' into edac-for-next)
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 (54e6a3c 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 (bc7ee55 regmap: Add trace event for successful cache reads)
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 (7962fce tty: n_hdlc not atomic use tty->flags.)
CONFLICT (content): Merge conflict in drivers/tty/serial/Makefile
CONFLICT (content): Merge conflict in drivers/tty/serial/Kconfig
Merging usb/usb-next (b870def USB: ohci-s3c2410: add PM support)
Merging staging/staging-next (976d534 rtl8192e: Rename clashing symbols)
CONFLICT (content): Merge conflict in drivers/staging/iio/industrialio-core.c
CONFLICT (content): Merge conflict in drivers/staging/iio/adc/ad799x_core.c
CONFLICT (content): Merge conflict in drivers/staging/hv/Makefile
CONFLICT (content): Merge conflict in drivers/staging/hv/Kconfig
CONFLICT (content): Merge conflict in drivers/hid/hid-hyperv.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 (16ed8d9 btrfs: fix dirtied pages accounting on sub-page writes)
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 (5becdc7 pinctrl/coh901: driver to request its pins)
Merging moduleh/for-sfr (6aec187 drivers/media: video/a5k6aa is a module and so needs module.h)
Merging vhost/linux-next (cf64b8c frv: 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
Applying: cpusets-stall-when-updating-mems_allowed-for-mempolicy-or-disjoint-nodemask-fix
Merging akpm (0993075 cpusets-stall-when-updating-mems_allowed-for-mempolicy-or-disjoint-nodemask-fix)
[master a3a0e7c] Revert "include/net/netprio_cgroup.h: various fixes"
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: linux-next: manual merge of the staging tree with the hid tree
From: Greg KH @ 2011-12-01 3:51 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, K. Y. Srinivasan, Thomas Meyer,
Jiri Kosina
In-Reply-To: <20111201143952.9aea929b16c7212570fc1bd2@canb.auug.org.au>
On Thu, Dec 01, 2011 at 02:39:52PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in
> drivers/hid/hid-hyperv.c between commit b95f5bcb811e ("HID: Move the
> hid-hyperv driver out of staging") from the hid tree and various commits
> from the staging tree (this was drivers/staging/hv/hv_mouse.c).
>
> The commit message says that all the changes that happened when this file
> moved from staging have also been applied to the staging file, so I just
> used the version from the hid tree.
Ok, that's fine, Jiri, want me to just delete the driver from my tree
now to remove any of these conflicts?
thanks,
greg k-h
^ permalink raw reply
* linux-next: manual merge of the staging tree with the hid tree
From: Stephen Rothwell @ 2011-12-01 3:40 UTC (permalink / raw)
To: Greg KH
Cc: linux-next, linux-kernel, Haiyang Zhang, Mike Sterling,
K. Y. Srinivasan, Jiri Kosina
[-- Attachment #1: Type: text/plain, Size: 1610 bytes --]
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in
drivers/staging/hv/Makefile and drivers/staging/hv/Kconfig between
commits b95f5bcb811e ("HID: Move the hid-hyperv driver out of staging")
and 045b1684bc21 ("Staging: hv: mousevsc: Remove the mouse driver from
the staging tree") from the hid tree and commit 95fa0405c599 ("staging:
hv: move hv_netvsc out of staging area") from the staging tree.
I fixed them up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/staging/hv/Kconfig
index 6c0dc30,8a51166..0000000
--- a/drivers/staging/hv/Kconfig
+++ b/drivers/staging/hv/Kconfig
@@@ -3,9 -3,9 +3,3 @@@ config HYPERV_STORAG
depends on HYPERV && SCSI
help
Select this option to enable the Hyper-V virtual storage driver.
--
- config HYPERV_NET
- tristate "Microsoft Hyper-V virtual network driver"
- depends on HYPERV && NET
- help
- Select this option to enable the Hyper-V virtual network driver.
-config HYPERV_MOUSE
- tristate "Microsoft Hyper-V mouse driver"
- depends on HYPERV && HID
- help
- Select this option to enable the Hyper-V mouse driver.
diff --cc drivers/staging/hv/Makefile
index fbe9a42,6c97747..0000000
--- a/drivers/staging/hv/Makefile
+++ b/drivers/staging/hv/Makefile
@@@ -1,5 -1,4 +1,3 @@@
obj-$(CONFIG_HYPERV_STORAGE) += hv_storvsc.o
- obj-$(CONFIG_HYPERV_NET) += hv_netvsc.o
-obj-$(CONFIG_HYPERV_MOUSE) += hv_mouse.o
hv_storvsc-y := storvsc_drv.o
- hv_netvsc-y := netvsc_drv.o netvsc.o rndis_filter.o
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: manual merge of the staging tree with the hid tree
From: Stephen Rothwell @ 2011-12-01 3:39 UTC (permalink / raw)
To: Greg KH
Cc: linux-next, linux-kernel, K. Y. Srinivasan, Thomas Meyer,
Jiri Kosina
[-- Attachment #1: Type: text/plain, Size: 582 bytes --]
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in
drivers/hid/hid-hyperv.c between commit b95f5bcb811e ("HID: Move the
hid-hyperv driver out of staging") from the hid tree and various commits
from the staging tree (this was drivers/staging/hv/hv_mouse.c).
The commit message says that all the changes that happened when this file
moved from staging have also been applied to the staging file, so I just
used the version from the hid tree.
--
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: ERROR: end_request: I/O error, dev fd0, sector 0
From: Robert Hancock @ 2011-12-01 2:25 UTC (permalink / raw)
To: sedat.dilek; +Cc: Jens Axboe, Tejun Heo, LKML, linux-next, Stephen Rothwell
In-Reply-To: <CA+icZUVhxHxoED2P7=kYqxYyg-8s3am4PSAvZLE8YSYAAHpaqA@mail.gmail.com>
On Sun, Nov 27, 2011 at 7:52 AM, Sedat Dilek <sedat.dilek@googlemail.com> wrote:
> On Sat, Nov 26, 2011 at 5:52 PM, Robert Hancock <hancockrwd@gmail.com> wrote:
>> On 11/25/2011 06:53 AM, Sedat Dilek wrote:
>>>
>>> Hi,
>>>
>>> I am watching this issue for a long while, due to my
>>> floppy-blacklist.conf file since next-20110603.
>>>
>>> The bad: The boot-process stalls for approx 10-13 secs when booting
>>> into my Debian/sid i386 system.
>>>
>>> # dmesg | grep -A1 -B1 "end_request: I/O error, dev fd0, sector 0"
>>> [ 2.422854] sd 2:0:0:0: [sdb] Attached SCSI disk
>>> [ 15.289939] end_request: I/O error, dev fd0, sector 0
>>> [ 15.342914] EXT4-fs (sda5): mounted filesystem with ordered data
>>> mode. Opts: (null)
>>>
>>> The funny part is my IBM laptop has no physical floppy drive!
>>>
>>> # dmesg | egrep -i 'floppy|fd0'
>>> [ 0.726358] Floppy drive(s): fd0 is 1.44M
>>> [ 15.289939] end_request: I/O error, dev fd0, sector 0
>>>
>>> If I blacklist "floppy" kernel-module, the boot-process is as expected
>>> without the above mentionned delay.
>>>
>>> [ /etc/modprobe.d/floppy-blacklist.conf ]
>>> # This file blacklists the floppy driver.
>>> #
>>> # XXX: Workaround: My IBM ThinkPad T40p (model 2374SG6) notebook has
>>> no physical FDD
>>> # dmesg from linux-next (next-20110603) says:
>>> # [ 0.755294] Floppy drive(s): fd0 is 1.44M
>>> # [ 15.238507] end_request: I/O error, dev fd0, sector 0
>>> blacklist floppy
>>> - EOF -
>>>
>>> I searched for the line and found bool blk_update_request() in
>>> block/blk-core.c file (see [1]).
>>>
>>> I have attached kern.log and dmesg.
>>>
>>> Hope this helps to narrow down the issue.
>>
>> It looks like your laptop's BIOS indicates it has a floppy controller that's
>> active:
>>
>> Nov 25 11:00:32 tbox kernel: [ 0.060821] pnp 00:09: [io 0x03f0-0x03f5]
>> Nov 25 11:00:32 tbox kernel: [ 0.060825] pnp 00:09: [io 0x03f7]
>> Nov 25 11:00:32 tbox kernel: [ 0.060828] pnp 00:09: [irq 6]
>> Nov 25 11:00:32 tbox kernel: [ 0.060831] pnp 00:09: [dma 2]
>> Nov 25 11:00:32 tbox kernel: [ 0.060892] pnp 00:09: Plug and Play ACPI
>> device, IDs PNP0700 (active)
>>
>> That's presumably why the floppy driver ends up being loaded. And apparently
>> it does have a floppy controller, since the floppy driver seems able to talk
>> to it. Maybe that model of laptop had an optional bay-mounted floppy drive
>> or something?
>>
>
> Could be... next to CD_ROM bay maybe.
>
>> I'm not sure there's a workaround for this at the kernel level, since the
>> kernel probably can't determine if there's actually a floppy drive installed
>> without trying to read from it (which is likely being triggered by partition
>> probing or something). The read error will be what is triggering the message
>> you saw.
>>
>> Is there a BIOS option to disable the floppy controller?
>>
>
> I have disabled "Floppy-Drive" in BIOS setup now (was set to
> "enabled"), but I have still the modprobe backlist for floppy
> activated.
>
> Can you explain the stalling of ***10-12 seconds*** with a wrong FDD
> BIOS setting?
> That's really a long duration, with systemd my boot-process takes
> approx 15-18 seconds.
Well, I can imagine that the floppy request takes that long to time
out or fail. I'm not sure why this would be delaying the boot process,
however.
>
> Attached is the new dmesg output (kernel-config was not changed).
It looks like the BIOS is no longer reporting the floppy controller as
present, so hopefully you shouldn't need the workaround.
^ permalink raw reply
* linux-next: manual merge of the trivial tree with the 4xx tree
From: Stephen Rothwell @ 2011-12-01 2:16 UTC (permalink / raw)
To: Jiri Kosina
Cc: linux-next, linux-kernel, Tanmay Inamdar, Josh Boyer, Paul Bolle
[-- Attachment #1: Type: text/plain, Size: 1280 bytes --]
Hi Jiri,
Today's linux-next merge of the trivial tree got a conflict in
arch/powerpc/platforms/40x/Kconfig between commit d5b9ee7b514e
("powerpc/40x: Add APM8018X SOC support") from the 4xx tree and commit
ff5f483f3091 ("powerpc: 4xx: remove commented out Kconfig entries") from
the trivial tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/powerpc/platforms/40x/Kconfig
index 8883f2c,bd69cf8..0000000
--- a/arch/powerpc/platforms/40x/Kconfig
+++ b/arch/powerpc/platforms/40x/Kconfig
@@@ -172,28 -148,3 +148,12 @@@ config IBM405_ERR7
# All 40x-based cores, up until the 405GPR and 405EP have this errata.
config IBM405_ERR51
bool
+
- #config BIOS_FIXUP
- # bool
- # depends on BUBINGA || EP405 || SYCAMORE || WALNUT
- # default y
-
- #config PPC4xx_DMA
- # bool "PPC4xx DMA controller support"
- # depends on 4xx
-
- #config PPC4xx_EDMA
- # bool
- # depends on !STB03xxx && PPC4xx_DMA
- # default y
- #
-
+config APM8018X
+ bool "APM8018X"
+ depends on 40x
+ default n
+ select PPC40x_SIMPLE
+ help
+ This option enables support for the AppliedMicro APM8018X evaluation
+ board.
-
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: build failure after merge of the v9fs tree
From: Stephen Rothwell @ 2011-12-01 1:02 UTC (permalink / raw)
To: Eric Van Hensbergen; +Cc: linux-next, linux-kernel, Joe Perches
[-- Attachment #1: Type: text/plain, Size: 522 bytes --]
Hi Eric,
After merging the v9fs tree, today's linux-next build (x86_64
allmodconfig) failed like this:
ERROR: "_p9_debug" [net/9p/9pnet_virtio.ko] undefined!
ERROR: "_p9_debug" [net/9p/9pnet_rdma.ko] undefined!
ERROR: "_p9_debug" [net/9p/9pnet.ko] undefined!
Caused by commit be9e4aa9e783 ("9p: Reduce object size with
CONFIG_NET_9P_DEBUG").
I have used the v9fs tree from next-20111130 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: linux-next: Tree for Sept 21
From: Stephen Rothwell @ 2011-11-30 23:39 UTC (permalink / raw)
To: Eric Van Hensbergen; +Cc: LKML, linux-next
In-Reply-To: <CAFkjPTmDk2BmF8U52Te=YojJsFCcz2bJPJG8X0mZFjqAho9TyQ@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 364 bytes --]
Hi Eric,
On Wed, 30 Nov 2011 15:02:58 -0600 Eric Van Hensbergen <ericvh@gmail.com> wrote:
>
> v9fs tree for-next branch is back on kernel.org:
> git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git for-next
I have switched to that now.
--
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: Tree for Sept 21
From: Eric Van Hensbergen @ 2011-11-30 21:02 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: LKML, linux-next
In-Reply-To: <20110922002235.53ae8ed70b92d9d325a79a62@canb.auug.org.au>
On Wed, Sep 21, 2011 at 9:22 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Eric,
>
> On Wed, 21 Sep 2011 09:10:31 -0500 Eric Van Hensbergen <ericvh@gmail.com> wrote:
>>
>> You can switch the v9fs tree to pull from the for-next branch of
>> github.com:ericvh/linux.git until kernel.org gets back. Hopefully
>> that will resolve the reported merge conflict.
>
> OK, I will switch to this tree from tomorrow - assuming that the real
> Eric does't complain :-).
>
v9fs tree for-next branch is back on kernel.org:
git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git for-next
Thanks,
-eric
^ permalink raw reply
* Re: merge conflict resolution for pm-freezer
From: Rafael J. Wysocki @ 2011-11-30 19:51 UTC (permalink / raw)
To: Tejun Heo; +Cc: sfr, linux-pm, linux-next
In-Reply-To: <201111292321.27660.rjw@sisk.pl>
On Tuesday, November 29, 2011, Rafael J. Wysocki wrote:
> 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. :-)
No, that won't work. I think I'll resolve the conflict when merging pm-freezer
into pm-for-linus later.
Thanks,
Rafael
^ permalink raw reply
* Re: linux-next: Tree for Nov 29 (drm)
From: Dave Airlie @ 2011-11-30 17:51 UTC (permalink / raw)
To: Randy Dunlap
Cc: Sérgio Basto, Stephen Rothwell, linux-next, LKML, dri-devel
In-Reply-To: <4ED67387.90902@xenotime.net>
2011/11/30 Randy Dunlap <rdunlap@xenotime.net>:
> On 11/30/2011 09:16 AM, Sérgio Basto wrote:
>> Randy, not dri-devel@lists.sourceforge.net, anymore
>> now is dri-devel@lists.freedesktop.org
>
> Argh, thanks.
> That was thunderbird trying to be too helpful. :(
Ah well I got it and it should be fixed now.
Dave.
^ permalink raw reply
* Re: linux-next: Tree for Nov 29 (drm)
From: Randy Dunlap @ 2011-11-30 18:18 UTC (permalink / raw)
To: Sérgio Basto; +Cc: Stephen Rothwell, linux-next, LKML, dri-devel
In-Reply-To: <1322673417.31541.1.camel@segulix>
On 11/30/2011 09:16 AM, Sérgio Basto wrote:
> Randy, not dri-devel@lists.sourceforge.net, anymore
> now is dri-devel@lists.freedesktop.org
Argh, thanks.
That was thunderbird trying to be too helpful. :(
> On Tue, 2011-11-29 at 12:33 -0800, Randy Dunlap wrote:
>> On 11/28/2011 08:20 PM, Stephen Rothwell wrote:
>>> Hi all,
>>>
>>> Changes since 20111128:
>>>
>>> The drm tree lost its build failure but gained another for which I
>>> applied a patch.
>>
>>
>> ERROR: "drm_helper_get_fb_bpp_depth" [drivers/gpu/drm/vmwgfx/vmwgfx.ko] undefined!
>>
>> Full x86_64 randconfig file is attached.
>>
>> ------------------------------------------------------------------------------
>> -- _______________________________________________ Dri-devel mailing list Dri-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/dri-devel
>
--
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
^ permalink raw reply
* Re: linux-next: Tree for Nov 29 (drm)
From: Sérgio Basto @ 2011-11-30 17:16 UTC (permalink / raw)
To: Randy Dunlap; +Cc: Stephen Rothwell, linux-next, LKML, dri-devel
In-Reply-To: <4ED5417C.1030908@xenotime.net>
Randy, not dri-devel@lists.sourceforge.net, anymore
now is dri-devel@lists.freedesktop.org
On Tue, 2011-11-29 at 12:33 -0800, Randy Dunlap wrote:
> On 11/28/2011 08:20 PM, Stephen Rothwell wrote:
> > Hi all,
> >
> > Changes since 20111128:
> >
> > The drm tree lost its build failure but gained another for which I
> > applied a patch.
>
>
> ERROR: "drm_helper_get_fb_bpp_depth" [drivers/gpu/drm/vmwgfx/vmwgfx.ko] undefined!
>
> Full x86_64 randconfig file is attached.
>
> ------------------------------------------------------------------------------
> All the data continuously generated in your IT infrastructure
> contains a definitive record of customers, application performance,
> security threats, fraudulent activity, and more. Splunk takes this
> data and makes sense of it. IT sense. And common sense.
> http://p.sf.net/sfu/splunk-novd2d
> -- _______________________________________________ Dri-devel mailing list Dri-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/dri-devel
--
Sérgio M. B.
^ permalink raw reply
* Re: [osd-dev] [PATCH v3] ore: FIX breakage when MISC_FILESYSTEMS is not set
From: Randy Dunlap @ 2011-11-30 18:00 UTC (permalink / raw)
To: Boaz Harrosh
Cc: Trond Myklebust, Michal Marek, Stephen Rothwell, NFS list, LKML,
Benny Halevy, linux-next, open-osd
In-Reply-To: <4ED5803D.8030906@panasas.com>
On 11/29/2011 05:00 PM, Boaz Harrosh wrote:
> 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/
sounds good to me.
> 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?
I'm not terribly worried about them. If they work, that's fine.
If they break some day, it's easy to fix.
or if you prefer to fix it now, you could add something like:
# for ASYNC_XOR selects:
select ASYNC_CORE
select XOR_BLOCKS
Either way is OK with me.
Thanks.
> 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
>
> --
--
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
^ permalink raw reply
* Re: [PATCH v3] ore: FIX breakage when MISC_FILESYSTEMS is not set
From: Boaz Harrosh @ 2011-11-30 16:32 UTC (permalink / raw)
To: Michal Marek
Cc: Randy Dunlap, Trond Myklebust, Stephen Rothwell, NFS list, LKML,
Benny Halevy, linux-next, open-osd
In-Reply-To: <4ED5E9E1.9050709@suse.cz>
On 11/30/2011 12:31 AM, Michal Marek wrote:
>
> I suggest you name it Kconfig.ore. We have a couple of Kconfig.* files
> in the tree, so let's be consistent.
>
Thanks Michal.
Yes that makes sense. Actually I like it better.
Will change and push
> Michal
Boaz
^ permalink raw reply
* Re: linux-next: build failure after merge of the final tree (akpm tree related)
From: Neil Horman @ 2011-11-30 11:48 UTC (permalink / raw)
To: Andrew Morton; +Cc: David Miller, sfr, linux-next, linux-kernel
In-Reply-To: <20111129220728.b3351335.akpm@linux-foundation.org>
On Tue, Nov 29, 2011 at 10:07:28PM -0800, Andrew Morton wrote:
> 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.
>
>
I implemented this code the same way that the net_cls cgroup does. I'm not at
all sure whats going on in your tree, as its building as both a module and
monolitically in net-next. I'll get it sorted today though.
Neil
^ permalink raw reply
* Re: linux-next: manual merge of the vhost tree with the hexagon tree
From: Stephen Rothwell @ 2011-11-30 9:50 UTC (permalink / raw)
To: Richard Kuo; +Cc: Michael S. Tsirkin, linux-next, linux-kernel
In-Reply-To: <20111130064553.GA2393@codeaurora.org>
[-- Attachment #1: Type: text/plain, Size: 941 bytes --]
Hi Richard,
On Wed, 30 Nov 2011 00:45:53 -0600 Richard Kuo <rkuo@codeaurora.org> wrote:
>
> On Tue, Nov 29, 2011 at 02:22:59PM +1100, Stephen Rothwell wrote:
> >
> > 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?
No, just ignore it. Linus will fix it up when he merges the trees into
his. Its pretty trivial anyway.
--
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 v3] ore: FIX breakage when MISC_FILESYSTEMS is not set
From: Michal Marek @ 2011-11-30 8:31 UTC (permalink / raw)
To: Boaz Harrosh
Cc: Randy Dunlap, Trond Myklebust, Stephen Rothwell, NFS list, LKML,
Benny Halevy, linux-next, open-osd
In-Reply-To: <4ED56C59.208@panasas.com>
Dne 30.11.2011 00:35, Boaz Harrosh napsal(a):
>
> 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"
> +
I suggest you name it Kconfig.ore. We have a couple of Kconfig.* files
in the tree, so let's be consistent.
Michal
^ 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