* Re: linux-next: manual merge of the hid tree with Linus' tree
From: Jiri Kosina @ 2011-10-11 10:52 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Jiri Kosina, linux-next, linux-kernel, David Herrmann,
Bastien Nocera, Jason Gerecke, Dmitry Torokhov
In-Reply-To: <20111011143755.68708e9f278048e12321a9e6@canb.auug.org.au>
On Tue, 11 Oct 2011, Stephen Rothwell wrote:
> Hi Jiri,
>
> Today's linux-next merge of the hid tree got a conflict in
> drivers/hid/hid-wacom.c between commit 3512069eefd3 ("Input: wacom - add
> POINTER and DIRECT device properties") from Linus' tree and commit
> 3797ef6b6bc0 ("HID: wacom: Set input bits before registration") from the
> hid tree.
>
> I fixed it up (maybe - see below) and can carry the fix as necessary.
That is a correct resolution, thanks.
--
Jiri Kosina
SUSE Labs
^ permalink raw reply
* Re: linux-next: build warnings after merge of the writeback tree
From: Wu Fengguang @ 2011-10-11 9:33 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
In-Reply-To: <20111011202736.2c0a7ac57a4a5c9c43564f13@canb.auug.org.au>
On Tue, Oct 11, 2011 at 05:27:36PM +0800, Stephen Rothwell wrote:
> Hi,
>
> On Tue, 11 Oct 2011 17:17:25 +0800 Wu Fengguang <fengguang.wu@intel.com> wrote:
> >
> > On Tue, Oct 11, 2011 at 04:57:04PM +0800, Stephen Rothwell wrote:
> > >
> > > After merging the writeback tree, today's linux-next build (powerpc
> > > allnoconfig) produced these warnings:
> > >
> > > mm/page-writeback.c: In function 'bdi_position_ratio':
> > > mm/page-writeback.c:622:3: warning: comparison of distinct pointer types lacks a cast [enabled by default]
> > > page-writeback.c:635:4: warning: comparison of distinct pointer types lacks a cast [enabled by default]
> > >
> > > Introduced by commits 6c14ae1e92c7 ("writeback: dirty position control")
> > > and 8927f66c4ede ("writeback: dirty position control - bdi reserve area").
> >
> > Ah sorry! The below patch should fix it. Shall I update the original
> > commits in place, or append this patch as a new commit?
>
> That choice is up to you as the maintainer of that tree. Either works
> for me (appending is easier for you and me, and the warning is not a
> problem as far as bisection is concerned).
Got it!
> > Fix powerpc compile warnings
> >
> > mm/page-writeback.c: In function 'bdi_position_ratio':
> > mm/page-writeback.c:622:3: warning: comparison of distinct pointer types lacks a cast [enabled by default]
> > page-writeback.c:635:4: warning: comparison of distinct pointer types lacks a cast [enabled by default]
> >
> > Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
>
> If you do keep it separate, you could add a
>
> Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
>
> above your SOB line.
OK!
Thanks,
Fengguang
^ permalink raw reply
* Re: linux-next: build warnings after merge of the writeback tree
From: Stephen Rothwell @ 2011-10-11 9:27 UTC (permalink / raw)
To: Wu Fengguang; +Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
In-Reply-To: <20111011091725.GA31349@localhost>
[-- Attachment #1: Type: text/plain, Size: 1666 bytes --]
Hi,
On Tue, 11 Oct 2011 17:17:25 +0800 Wu Fengguang <fengguang.wu@intel.com> wrote:
>
> On Tue, Oct 11, 2011 at 04:57:04PM +0800, Stephen Rothwell wrote:
> >
> > After merging the writeback tree, today's linux-next build (powerpc
> > allnoconfig) produced these warnings:
> >
> > mm/page-writeback.c: In function 'bdi_position_ratio':
> > mm/page-writeback.c:622:3: warning: comparison of distinct pointer types lacks a cast [enabled by default]
> > page-writeback.c:635:4: warning: comparison of distinct pointer types lacks a cast [enabled by default]
> >
> > Introduced by commits 6c14ae1e92c7 ("writeback: dirty position control")
> > and 8927f66c4ede ("writeback: dirty position control - bdi reserve area").
>
> Ah sorry! The below patch should fix it. Shall I update the original
> commits in place, or append this patch as a new commit?
That choice is up to you as the maintainer of that tree. Either works
for me (appending is easier for you and me, and the warning is not a
problem as far as bisection is concerned).
> Fix powerpc compile warnings
>
> mm/page-writeback.c: In function 'bdi_position_ratio':
> mm/page-writeback.c:622:3: warning: comparison of distinct pointer types lacks a cast [enabled by default]
> page-writeback.c:635:4: warning: comparison of distinct pointer types lacks a cast [enabled by default]
>
> Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
If you do keep it separate, you could add a
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
above your SOB line.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: build warning after merge of the moduleh tree
From: Stephen Rothwell @ 2011-10-11 9:21 UTC (permalink / raw)
To: Paul Gortmaker
Cc: linux-next, linux-kernel, Gleb Natapov, Thomas Gleixner,
Ingo Molnar, H. Peter Anvin, Peter Zijlstra
[-- Attachment #1: Type: text/plain, Size: 825 bytes --]
Hi Paul,
After merging the moduleh tree, today's linux-next build (i386 defconfig)
produced this warning:
arch/x86/kernel/cpu/perf_event_intel.c:1323:1: warning: data definition has no type or storage class [enabled by default]
arch/x86/kernel/cpu/perf_event_intel.c:1323:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL' [-Wimplicit-int]
arch/x86/kernel/cpu/perf_event_intel.c:1323:1: warning: parameter names (without types) in function declaration [enabled by default]
Introduced by commit 144d31e6f190 ("perf, intel: Use GO/HO bits in
perf-ctr") from the tip tree interacting with the module.h slipt up.
I'll add a patch tomorrow to add an include of export.h to this file.
--
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: build warnings after merge of the writeback tree
From: Wu Fengguang @ 2011-10-11 9:17 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
In-Reply-To: <20111011195704.67c267dbb3c6eaaacf5d7a39@canb.auug.org.au>
Hi Stephen,
On Tue, Oct 11, 2011 at 04:57:04PM +0800, Stephen Rothwell wrote:
> Hi Wu,
>
> After merging the writeback tree, today's linux-next build (powerpc
> allnoconfig) produced these warnings:
>
> mm/page-writeback.c: In function 'bdi_position_ratio':
> mm/page-writeback.c:622:3: warning: comparison of distinct pointer types lacks a cast [enabled by default]
> page-writeback.c:635:4: warning: comparison of distinct pointer types lacks a cast [enabled by default]
>
> Introduced by commits 6c14ae1e92c7 ("writeback: dirty position control")
> and 8927f66c4ede ("writeback: dirty position control - bdi reserve area").
Ah sorry! The below patch should fix it. Shall I update the original
commits in place, or append this patch as a new commit?
Thanks,
Fengguang
---
Subject: writeback: fix ppc compile warnings on do_div(long long, unsigned long)
Date: Tue Oct 11 17:06:33 CST 2011
Fix powerpc compile warnings
mm/page-writeback.c: In function 'bdi_position_ratio':
mm/page-writeback.c:622:3: warning: comparison of distinct pointer types lacks a cast [enabled by default]
page-writeback.c:635:4: warning: comparison of distinct pointer types lacks a cast [enabled by default]
Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
---
mm/page-writeback.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
--- linux-next.orig/mm/page-writeback.c 2011-10-11 17:04:00.000000000 +0800
+++ linux-next/mm/page-writeback.c 2011-10-11 17:06:31.000000000 +0800
@@ -618,8 +618,8 @@ static unsigned long bdi_position_ratio(
x_intercept = bdi_setpoint + span;
if (bdi_dirty < x_intercept - span / 4) {
- pos_ratio *= x_intercept - bdi_dirty;
- do_div(pos_ratio, x_intercept - bdi_setpoint + 1);
+ pos_ratio = div_u64(pos_ratio * (x_intercept - bdi_dirty),
+ x_intercept - bdi_setpoint + 1);
} else
pos_ratio /= 4;
@@ -630,10 +630,9 @@ static unsigned long bdi_position_ratio(
*/
x_intercept = bdi_thresh / 2;
if (bdi_dirty < x_intercept) {
- if (bdi_dirty > x_intercept / 8) {
- pos_ratio *= x_intercept;
- do_div(pos_ratio, bdi_dirty);
- } else
+ if (bdi_dirty > x_intercept / 8)
+ pos_ratio = div_u64(pos_ratio * x_intercept, bdi_dirty);
+ else
pos_ratio *= 8;
}
^ permalink raw reply
* linux-next: Tree for Oct 11
From: Stephen Rothwell @ 2011-10-11 9:11 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 37405 bytes --]
Hi all,
The linux-next tree is now available from
git://github.com/sfrothwell/linux-next.git as a temporary measure while
the kernel.org servers are unavailable.
It may also turn up on git.kernel.org (depending on the mirroring). The
patch set is still absent, however.
Changes since 20111007:
Removed tree: ide (at the maintainer's request)
Renamed trees:
sparc -> sparc-next
sparc-current -> sparc
net -> next-next
net-current -> net
ide-current -> ide
voltage -> regulator
The arm-lpae tree lost 2 conflicts.
The arm-soc tree lost its build failure.
The i.MX tree lost a conflict.
The s5p tree gained a conflict against the arm tree.
The hid tree gained a conflict agaains Linus' tree.
The infiniband tree gained a build failure so I used th version from
next-20111007.
The net-next tree lost a conflict.
The sound tree gained a conflict against the arm-soc tree.
The sound-asoc tree lost its build failure so.
The device-mapper tree lost its conflict.
The md tree lost its build failure but gained another so I used the
version from next-20111006.
The mfd tree gained a conflict against the amr-soc tree.
The omap_dss2 tree gained a conflict against the arm-soc tree.
The gpio tree still has its build failure so I used the version from
next-20111005.
The hwspinlock tree gained a conflict against the arm-soc tree.
The moduleh tree gained 2 build failures for which I applied a patches.
----------------------------------------------------------------------------
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/v2.6/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 201 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
Merging fixes/fixes
Merging kbuild-current/rc-fixes
Merging arm-current/fixes
Merging m68k-current/for-linus
Merging powerpc-merge/merge
Merging 52xx-and-virtex-current/powerpc/merge
Merging sparc/master
Merging scsi-rc-fixes/master
Merging net/master
Merging sound-current/for-linus
Merging pci-current/for-linus
Merging wireless-current/master
Merging driver-core.current/driver-core-linus
Merging tty.current/tty-linus
Merging usb.current/usb-linus
Merging staging.current/staging-linus
Merging cpufreq-current/fixes
Merging input-current/for-linus
Merging md-current/for-linus
Merging audit-current/for-linus
Merging crypto-current/master
Merging ide/master
Merging dwmw2/master
Merging sh-current/sh-fixes-for-linus
Merging rmobile-current/rmobile-fixes-for-linus
Merging devicetree-current/devicetree/merge
Merging spi-current/spi/merge
Merging arm/for-next
Merging arm-lpae/for-next
CONFLICT (content): Merge conflict in arch/arm/include/asm/page.h
CONFLICT (content): Merge conflict in arch/arm/include/asm/pgtable-hwdef.h
CONFLICT (content): Merge conflict in arch/arm/include/asm/pgtable.h
CONFLICT (content): Merge conflict in arch/arm/kernel/head.S
CONFLICT (content): Merge conflict in arch/arm/kernel/sleep.S
CONFLICT (content): Merge conflict in arch/arm/mm/dma-mapping.c
CONFLICT (content): Merge conflict in arch/arm/mm/mmu.c
Merging arm-soc/for-next
CONFLICT (rename/delete): Rename arch/arm/include/asm/sizes.h->arch/arm/mach-picoxcell/include/mach/uncompress.h in arm-soc/for-next and deleted in HEAD
CONFLICT (add/add): Merge conflict in Documentation/devicetree/bindings/arm/l2cc.txt
CONFLICT (content): Merge conflict in arch/arm/boot/compressed/Makefile
CONFLICT (content): Merge conflict in arch/arm/include/asm/hardware/cache-l2x0.h
CONFLICT (content): Merge conflict in arch/arm/kernel/smp.c
CONFLICT (delete/modify): arch/arm/mach-at91/board-usb-a9260.c deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/mach-at91/board-usb-a9260.c left in tree.
CONFLICT (content): Merge conflict in arch/arm/mach-msm/board-msm8x60.c
CONFLICT (content): Merge conflict in arch/arm/mach-mxs/include/mach/gpio.h
CONFLICT (delete/modify): arch/arm/mach-nuc93x/Makefile.boot deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/mach-nuc93x/Makefile.boot left in tree.
CONFLICT (content): Merge conflict in arch/arm/mach-tegra/board-paz00.h
CONFLICT (content): Merge conflict in arch/arm/mach-tegra/board-seaboard.h
CONFLICT (content): Merge conflict in arch/arm/mach-u300/Makefile.boot
CONFLICT (content): Merge conflict in arch/arm/mm/cache-l2x0.c
CONFLICT (content): Merge conflict in arch/arm/plat-mxc/include/mach/gpio.h
$ git rm -f arch/arm/mach-at91/board-usb-a9260.c arch/arm/mach-nuc93x/Makefile.boot
Applying: arm-soc: merge fixup for fixup/reserve being added to MACHINE descriptions
Merging at91/at91-next
CONFLICT (content): Merge conflict in arch/arm/mach-at91/at91sam9g45.c
Merging davinci/davinci-next
Merging i.MX/for-next
CONFLICT (content): Merge conflict in arch/arm/mach-mx5/mm.c
Merging linux-spec/for-next
Merging omap/for-next
Merging pxa/for-next
Merging samsung/next-samsung
Merging s5p/for-next
CONFLICT (content): Merge conflict in arch/arm/mach-exynos4/Kconfig
CONFLICT (content): Merge conflict in drivers/gpio/Makefile
Merging tegra/for-next
Merging xilinx/arm-next
Merging blackfin/for-linus
Merging c6x/for-linux-next
Merging cris/for-next
Merging quilt/hexagon
Merging ia64/next
Merging m68k/for-next
Merging m68knommu/for-next
Merging microblaze/next
Merging mips/mips-for-linux-next
Merging openrisc/for-upstream
Merging parisc/for-next
Merging powerpc/next
Merging 4xx/next
Merging 52xx-and-virtex/powerpc/next
Merging galak/next
Merging s390/features
Merging sh/sh-latest
Merging rmobile/rmobile-latest
Merging sparc-next/master
Merging tile/master
Merging unicore32/unicore32
Merging xtensa/master
Merging ceph/for-next
Merging cifs/master
Merging configfs/linux-next
Merging ecryptfs/next
Merging ext3/for_next
Merging ext4/dev
Merging fatfs/master
Merging fuse/for-next
Merging gfs2/master
Merging hfsplus/for-next
Merging jfs/next
Merging logfs/master
Merging nfs/linux-next
Merging nfsd/nfsd-next
Merging nilfs2/for-next
Merging ocfs2/linux-next
Merging omfs/for-next
Merging squashfs/master
Merging udf/for_next
Merging v9fs/for-next
Merging ubifs/linux-next
Merging xfs/master
CONFLICT (content): Merge conflict in fs/xfs/xfs_aops.c
CONFLICT (content): Merge conflict in fs/xfs/xfs_super.c
Merging vfs/for-next
Merging vfs-scale/vfs-scale-working
Merging pci/linux-next
Merging hid/for-next
CONFLICT (content): Merge conflict in drivers/hid/hid-wacom.c
Merging quilt/i2c
Merging bjdooks-i2c/next-i2c
Merging quilt/jdelvare-hwmon
Merging hwmon-staging/hwmon-next
Merging quilt/kernel-doc
Merging docs/docs-move
Merging v4l-dvb/master
Merging kbuild/for-next
Merging kconfig/for-next
Merging libata/NEXT
Merging infiniband/for-next
$ git reset --hard HEAD^
Merging refs/next/20111007/infiniband
Merging acpi/acpi
Merging idle-test/idle-test
Merging powertools/tools-test
Merging cpupowerutils/master
Merging ieee1394/for-next
Merging ubi/linux-next
Merging dlm/next
Merging swiotlb/master
Merging ibft/master
Merging scsi/master
Merging iscsi-target/for-next
Merging slave-dma/next
Merging async_tx/next
Merging net-next/master
CONFLICT (delete/modify): arch/powerpc/configs/40x/hcu4_defconfig deleted in HEAD and modified in net-next/master. Version net-next/master of arch/powerpc/configs/40x/hcu4_defconfig left in tree.
CONFLICT (content): Merge conflict in drivers/s390/cio/qdio_main.c
$ git rm -f arch/powerpc/configs/40x/hcu4_defconfig
Merging wireless/master
CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt
Merging bluetooth/master
CONFLICT (content): Merge conflict in net/bluetooth/hci_core.c
CONFLICT (content): Merge conflict in net/bluetooth/l2cap_core.c
CONFLICT (content): Merge conflict in net/bluetooth/mgmt.c
CONFLICT (content): Merge conflict in net/bluetooth/smp.c
Merging mtd/master
Merging l2-mtd/master
CONFLICT (content): Merge conflict in arch/arm/mach-at91/board-afeb-9260v1.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/board-neocore926.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/board-rm9200dk.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/board-sam9g20ek.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/board-sam9m10g45ek.c
CONFLICT (delete/modify): arch/arm/mach-at91/board-usb-a9260.c deleted in HEAD and modified in l2-mtd/master. Version l2-mtd/master of arch/arm/mach-at91/board-usb-a9260.c left in tree.
CONFLICT (content): Merge conflict in drivers/mtd/maps/lantiq-flash.c
$ git rm -f arch/arm/mach-at91/board-usb-a9260.c
Merging crypto/master
Merging sound/for-next
CONFLICT (content): Merge conflict in arch/arm/plat-omap/devices.c
CONFLICT (content): Merge conflict in arch/mips/alchemy/devboards/db1x00/platform.c
CONFLICT (content): Merge conflict in sound/mips/Kconfig
Merging sound-asoc/for-next
Merging cpufreq/next
Merging quilt/rr
Merging input/next
Merging input-mt/next
Merging lsm/for-next
Merging block/for-next
Merging quilt/device-mapper
Merging embedded/master
Merging firmware/master
Merging pcmcia/master
Merging battery/master
Merging leds/for-mm
CONFLICT (content): Merge conflict in drivers/leds/Kconfig
Merging backlight/for-mm
Merging mmc/mmc-next
CONFLICT (content): Merge conflict in drivers/mmc/core/core.c
CONFLICT (content): Merge conflict in drivers/mmc/core/sd.c
Merging kgdb/kgdb-next
Merging slab/for-next
Merging uclinux/for-next
Merging md/for-next
CONFLICT (content): Merge conflict in drivers/md/faulty.c
CONFLICT (content): Merge conflict in drivers/md/linear.c
CONFLICT (content): Merge conflict in drivers/md/md.c
CONFLICT (content): Merge conflict in drivers/md/md.h
CONFLICT (content): Merge conflict in drivers/md/multipath.c
CONFLICT (content): Merge conflict in drivers/md/raid0.c
CONFLICT (content): Merge conflict in drivers/md/raid1.c
CONFLICT (content): Merge conflict in drivers/md/raid10.c
CONFLICT (content): Merge conflict in drivers/md/raid5.c
$ git reset --hard HEAD^
Merging refs/next/20111006/md
Merging mfd/for-next
CONFLICT (content): Merge conflict in arch/arm/mach-imx/mach-mx31moboard.c
CONFLICT (content): Merge conflict in arch/arm/mach-u300/include/mach/irqs.h
Merging hdlc/hdlc-next
Merging drm/drm-next
Merging fbdev/fbdev-next
CONFLICT (content): Merge conflict in drivers/video/Kconfig
Merging viafb/viafb-next
Merging omap_dss2/for-next
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-2430sdp.c
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-4430sdp.c
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-apollon.c
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-h4.c
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-ldp.c
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-rx51.c
CONFLICT (delete/modify): drivers/video/omap/lcd_apollon.c deleted in omap_dss2/for-next and modified in HEAD. Version HEAD of drivers/video/omap/lcd_apollon.c left in tree.
CONFLICT (delete/modify): drivers/video/omap/lcd_ldp.c deleted in omap_dss2/for-next and modified in HEAD. Version HEAD of drivers/video/omap/lcd_ldp.c left in tree.
CONFLICT (delete/modify): drivers/video/omap/lcd_overo.c deleted in omap_dss2/for-next and modified in HEAD. Version HEAD of drivers/video/omap/lcd_overo.c left in tree.
$ git rm -f drivers/video/omap/lcd_apollon.c drivers/video/omap/lcd_ldp.c drivers/video/omap/lcd_overo.c
Merging regulator/for-next
Merging security/next
CONFLICT (content): Merge conflict in fs/ocfs2/xattr.c
Merging selinux/master
Merging lblnet/master
Merging agp/agp-next
Merging watchdog/master
Merging bdev/master
Merging dwmw2-iommu/master
Merging iommu/next
Merging cputime/cputime
Merging osd/linux-next
Merging jc_docs/docs-next
Merging nommu/master
Merging trivial/for-next
CONFLICT (content): Merge conflict in Documentation/PCI/pci.txt
CONFLICT (delete/modify): arch/arm/mach-nuc93x/time.c deleted in HEAD and modified in trivial/for-next. Version trivial/for-next of arch/arm/mach-nuc93x/time.c left in tree.
CONFLICT (content): Merge conflict in drivers/net/Kconfig
$ git rm -f arch/arm/mach-nuc93x/time.c
Merging audit/for-next
Merging pm/linux-next
CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/board-ap4evb.c
Merging apm/for-next
Merging fsnotify/for-next
Merging irda/for-next
Merging edac/linux_next
CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/mcheck/mce.c
Merging edac-amd/for-next
Merging devicetree/devicetree/next
Merging spi/spi/next
Merging gpio/gpio/next
$ git reset --hard HEAD^
Merging refs/next/20111005/gpio
Merging tip/auto-latest
CONFLICT (content): Merge conflict in drivers/iommu/Makefile
Applying: llist: add back llist_add_batch and llist_del_first
Merging rcu/rcu/next
Merging kmemleak/kmemleak
Merging kvm/kvm-updates/3.2
Merging oprofile/for-next
Merging ptrace/ptrace
Merging xen/upstream/xen
Merging xen-two/linux-next
CONFLICT (content): Merge conflict in arch/x86/xen/Kconfig
Merging xen-pvhvm/linux-next
Merging percpu/for-next
Merging workqueues/for-next
Merging sfi/sfi-test
Merging asm-generic/next
Merging drivers-x86/linux-next
Merging hwpoison/hwpoison
Merging sysctl/master
Merging namespace/master
Merging regmap/for-next
CONFLICT (content): Merge conflict in drivers/mfd/wm831x-spi.c
Merging driver-core/driver-core-next
CONFLICT (content): Merge conflict in arch/arm/plat-mxc/devices.c
Merging tty/tty-next
CONFLICT (content): Merge conflict in arch/powerpc/include/asm/udbg.h
CONFLICT (content): Merge conflict in arch/powerpc/kernel/udbg.c
CONFLICT (content): Merge conflict in drivers/tty/serial/8250.c
Merging usb/usb-next
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/Makefile
Merging staging/staging-next
CONFLICT (content): Merge conflict in drivers/misc/altera-stapl/altera.c
CONFLICT (content): Merge conflict in drivers/staging/brcm80211/brcmsmac/mac80211_if.c
CONFLICT (content): Merge conflict in drivers/staging/comedi/drivers/ni_labpc.c
CONFLICT (content): Merge conflict in drivers/staging/et131x/et1310_tx.c
CONFLICT (delete/modify): drivers/staging/rtl8192e/r8192E_core.c deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/rtl8192e/r8192E_core.c left in tree.
CONFLICT (content): Merge conflict in drivers/staging/xgifb/XGI_main_26.c
CONFLICT (content): Merge conflict in drivers/staging/zram/zram_drv.c
$ git rm -f drivers/staging/rtl8192e/r8192E_core.c
Merging bkl-config/config
Merging tmem/tmem
Merging writeback/writeback-for-next
Merging arm-dt/devicetree/arm-next
Merging hwspinlock/linux-next
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/hwspinlock.c
Merging pinctrl/for-next
CONFLICT (content): Merge conflict in arch/arm/mach-u300/Kconfig
CONFLICT (content): Merge conflict in arch/arm/mach-u300/core.c
Merging moduleh/for-sfr
CONFLICT (content): Merge conflict in arch/arm/mach-bcmring/mm.c
CONFLICT (content): Merge conflict in drivers/media/dvb/frontends/dibx000_common.c
CONFLICT (content): Merge conflict in drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
CONFLICT (content): Merge conflict in drivers/scsi/libfc/fc_lport.c
CONFLICT (delete/modify): drivers/staging/iio/industrialio-ring.c deleted in HEAD and modified in moduleh/for-sfr. Version moduleh/for-sfr of drivers/staging/iio/industrialio-ring.c left in tree.
CONFLICT (content): Merge conflict in include/linux/dmaengine.h
CONFLICT (content): Merge conflict in sound/soc/soc-io.c
$ git rm -f drivers/staging/iio/industrialio-ring.c
Applying: block/bsg-lib.c: change module.h -> export.h in power/common.c
Applying: mmc: using module_param requires the inclusion of moduleparam.h
Applying: NFC: use of module facilities requires the inclusion of module.h
Applying: arm: Add export.h to recently added files for EXPORT_SYMBOL
Applying: powerpc/powernv: include export.h in hvc_opal.h for THIS_MODULE
Applying: PM QoS: include export.h in qos.c for EXPORT_SYMBOL
Applying: net: Add export.h to nfc/nci/core.c
Applying: scsi: Add export.h to drivers/scsi/libsas/sas_host_smp.c
Applying: drivers/md: change module.h -> export.h in persistent-data/dm-*
Applying: drivers/net: Add module.h to wireless/ath/ath6kl/sdio.c
Applying: drivers/net: wireless/ath/ath5k/debug.c does not need module.h
Applying: drivers/bcma: driver_chipcommon_pmu.c needs export.h for EXPORT_SYMBOL
Applying: drivers/base: change module.h -> export.h in power/common.c
Applying: drivers/base: Add export.h to regmap/regcache.c
Applying: pinctrl: EXPORT_SYMBOL needs export.h
Applying: ath6kl: THIS_MODULES needs export.h
Applying: ath6kl: module_param needs the inclusion of moduleparam.h
Applying: rtlwifi: use of module_param requires the inclusion of moduleparam.h
Applying: staging: Add export.h to recently added files for EXPORT_SYMBOL
Applying: regulator: using module related services requires module.h
Applying: x86, nmi: include export.h for EXPORT_SYBBOL
Merging kvmtool/master
CONFLICT (content): Merge conflict in include/net/9p/9p.h
Merging scsi-post-merge/merge-base:master
$ git checkout akpm
Applying: include/linux/dmar.h: forward-declare struct acpi_dmar_header
Applying: drivers/net/ethernet/i825xx/3c505.c: fix build with dynamic debug
Applying: drm: fix kconfig unmet dependency warning
Applying: net/netfilter/nf_conntrack_netlink.c: fix Oops on container destroy
Applying: readlinkat: ensure we return ENOENT for the empty pathname for normal lookups
Applying: x86/paravirt: PTE updates in k(un)map_atomic need to be synchronous, regardless of lazy_mmu mode
Applying: acerhdf: add support for Aspire 1410 BIOS v1.3314
Applying: arch/x86/platform/iris/iris.c: register a platform device and a platform driver
Applying: hp_accel: Add a new PNP id
Applying: hp_accel: Add axis-mapping for HP ProBook / EliteBook
Applying: x86: fix mmap random address range
Applying: arch/x86/kernel/e820.c: eliminate bubble sort from sanitize_e820_map
Applying: vrtc: change its year offset from 1960 to 1972
Applying: x86: rtc: don't register a platform RTC device for Intel MID platforms
Applying: mrst: battery fixes
Applying: drivers/power/intel_mid_battery.c: fix build
Applying: x86,mrst: add mapping for bma023
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: arch/arm/mach-ux500/mbox-db5500.c: world-writable sysfs fifo file
Applying: arm, exec: remove redundant set_fs(USER_DS)
Applying: audit: always follow va_copy() with va_end()
Applying: btrfs: don't dereference extent_mapping if NULL
Applying: drivers/edac/mpc85xx_edac.c: fix memory controller compatible for edac
Applying: drivers/gpu/vga/vgaarb.c: add missing kfree
Applying: ia64, exec: remove redundant set_fs(USER_DS)
Applying: brlocks/lglocks: clean up code
Applying: brlocks-lglocks-clean-up-code-checkpatch-fixes
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-checkpatch-fixes
Applying: unicore32, exec: remove redundant set_fs(USER_DS)
Applying: drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.h: remove unused macro pr_fmt()
Applying: debugobjects: extend debugobjects 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: drivers/firmware/dmi_scan.c: make dmi_name_in_vendors more focused
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/sd.c: use ida_simple_get() and ida_simple_remove() in place of boilerplate code
Applying: drivers/scsi/osd/osd_uld.c: use ida_simple_get() to handle id
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: loop: prevent information leak after failed read
Applying: loop: cleanup set_status interface
Applying: loop-cleanup-set_status-interface-checkpatch-fixes
Applying: cciss: add half second delay to PCI PM reset code
Applying: cciss: auto engage SCSI mid layer at driver load time
Applying: slab: add taint flag outputting to debug paths.
Applying: slub: add taint flag outputting to debug paths
Applying: drivers/tty/serial/pch_uart.c: add console support
Applying: Cross Memory Attach
Applying: cross-memory-attach-update
Applying: cross-memory-attach-v4
Applying: mm: compaction: trivial clean up in acct_isolated()
Applying: mm: change isolate mode from #define to bitwise type
Applying: mm-change-isolate-mode-from-define-to-bitwise-type-fix
Applying: mm: compaction: make isolate_lru_page() filter-aware
Applying: mm-compaction-make-isolate_lru_page-filter-aware-fix
Applying: mm: zone_reclaim: make isolate_lru_page() filter-aware
Applying: mm-zone_reclaim-make-isolate_lru_page-filter-aware-fix
Applying: mm: migration: clean up unmap_and_move()
Applying: radix_tree: clean away saw_unset_tag leftovers
Applying: vmscan: add block plug for page reclaim
Applying: mm/page-writeback.c: make determine_dirtyable_memory static again
Applying: mm/page-writeback.c: document bdi_min_ratio
Applying: oom: avoid killing kthreads if they assume the oom killed thread's mm
Applying: oom: remove oom_disable_count
Applying: oom: fix race while temporarily setting current's oom_score_adj
Applying: tmpfs: add "tmpfs" to the Kconfig prompt to make it obvious.
Applying: mm: output a list of loaded modules when we hit bad_page()
Applying: mm: vmscan: drop nr_force_scan[] from get_scan_count
Applying: mm: distinguish between mlocked and pinned pages
Applying: mm: add comments to explain mm_struct fields
Applying: mm-add-comments-to-explain-mm_struct-fields-fix
Applying: mm: vmscan: do not writeback filesystem pages in direct reclaim
Applying: mm: vmscan: remove dead code related to lumpy reclaim waiting on pages under writeback
Applying: xfs: warn if direct reclaim tries to writeback pages
Applying: ext4: warn if direct reclaim tries to writeback pages
Applying: mm: vmscan: do not writeback filesystem pages in kswapd except in high priority
Applying: mm: vmscan: throttle reclaim if encountering too many dirty pages under writeback
Applying: mm-vmscan-throttle-reclaim-if-encountering-too-many-dirty-pages-under-writeback-update
Applying: mm: vmscan: immediately reclaim end-of-LRU dirty pages when writeback completes
Applying: vmscan: count pages into balanced for zone with good watermark
Applying: mm/debug-pagealloc.c: use plain __ratelimit() instead of printk_ratelimit()
Applying: lib/string.c: introduce memchr_inv()
Applying: lib-stringc-introduce-memchr_inv-fix-kernel-doc-for-memchr_inv
Applying: mm/debug-pagealloc.c: use memchr_inv
Applying: vmscan: fix initial shrinker size handling
Applying: vmscan: use atomic-long for shrinker batching
Applying: vmscan-use-atomic-long-for-shrinker-batching-fix
Applying: mm: avoid null pointer access in vm_struct via /proc/vmallocinfo
Applying: vmscan: promote shared file mapped pages
Applying: vmscan: activate executable pages after first usage
Applying: memblock: add memblock_start_of_DRAM()
Applying: memblock: add NO_BOOTMEM config symbol
Applying: mremap: check for overflow using deltas
Applying: mremap: avoid sending one IPI per page
Applying: thp: mremap support and TLB optimization
Applying: thp-mremap-support-and-tlb-optimization-fix
Applying: thp-mremap-support-and-tlb-optimization-fix-fix
Applying: thp-mremap-support-and-tlb-optimization-fix-fix-fix
Applying: include/asm-generic/page.h: calculate virt_to_page and page_to_virt via predefined macro
Applying: mm: iov_iter: have iov_iter_advance() decrement nr_segs appropriately
Applying: mm: neaten warn_alloc_failed
Applying: mm-neaten-warn_alloc_failed-fix
Applying: debug-pagealloc: add support for highmem pages
Applying: debug-pagealloc-add-support-for-highmem-pages-fix
Applying: kswapd: avoid unnecessary rebalance after an unsuccessful balancing
Applying: mm: add free_hot_cold_page_list() helper
Applying: mm/memblock.c: small function definition fixes
Applying: mm: compaction: compact unevictable pages
Applying: mm-compaction-compact-unevictable-pages-checkpatch-fixes
Applying: mm: compaction: accounting fix
Applying: kswapd: assign new_order and new_classzone_idx after wakeup in sleeping
Applying: mm: fix page-faults detection in swap-token logic
Applying: mm/vmalloc.c: report more vmalloc failures
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: thp: tail page refcounting fix
Applying: thp-tail-page-refcounting-fix-6
Applying: ksm: fix the comment of try_to_unmap_one()
Applying: mm-add-comment-explaining-task-state-setting-in-bdi_forker_thread-fix
Applying: vmscan: fix shrinker callback bug in fs/super.c
Applying: mm/mmap.c: eliminate the ret variable from mm_take_all_locks()
Applying: mm-mmapc-eliminate-the-ret-variable-from-mm_take_all_locks-fix
Applying: fs/buffer.c: add device information for error output in __find_get_block_slow()
Applying: HWPOISON: convert pr_debug()s to pr_info()s
Applying: mm: compaction: make compact_zone_order() static
Applying: mm: fix kunmap_high() comment
Applying: vmscan.c: fix invalid strict_strtoul() check in write_scan_unevictable_node()
Applying: mm: disable user interface to manually rescue unevictable pages
Applying: mm/memblock.c: quiet sparse noise
Applying: mm/thrash.c: quiet sparse noise
Applying: mm/mempolicy.c: quiet sparse noise
Applying: mm/huge_memory.c: quiet sparse noise
Applying: vmscan: add barrier to prevent evictable page in unevictable list
Applying: selinuxfs: remove custom hex_to_bin()
Applying: include/linux/security.h: fix security_inode_init_security() arg
Applying: hpet: factor timer allocate from open
Applying: alpha: wire up accept4 syscall
Applying: alpha: wire up sendmmsg syscall
Applying: intel_idle: fix API misuse
Applying: intel_idle: disable auto_demotion for hotplugged CPUs
Applying: fs/pipe.c: add ->statfs callback for pipefs
Applying: lib/Kconfig.debug: fix help message for DEFAULT_HUNG_TASK_TIMEOUT
Applying: hwmon: convert idr to ida and use ida_simple interface
Applying: drivers/hwmon/hwmon.c: convert idr to ida and use ida_simple_get()
Applying: lis3lv02d: avoid divide by zero due to unchecked
Applying: lis3: update maintainer information
Applying: lis3: add support for HP EliteBook 2730p
Applying: lis3: add support for HP EliteBook 8540w
Applying: hp_accel: add HP ProBook 655x
Applying: lis3: free regulators if probe() fails
Applying: lis3: use consistent naming of variables
Applying: lis3: change exported function to use passed parameter
Applying: lis3: remove the references to the global variable in core driver
Applying: lis3-remove-the-references-to-the-global-variable-in-core-driver-fix
Applying: lis3lv02d: make regulator API usage unconditional
Applying: driver/misc/fsa9480.c fix potential null-pointer dereference
Applying: stop_machine: make stop_machine safe and efficient to call early
Applying: stop_machine-make-stop_machine-safe-and-efficient-to-call-early-v3.
Applying: watchdog: move watchdog_*_all_cpus under CONFIG_SYSCTL
Applying: dynamic_debug: consolidate repetitive struct _ddebug descriptor definitions
Applying: dynamic_debug: remove num_enabled accounting
Applying: dynamic_debug: use a single printk() to emit messages
Applying: dynamic_debug: fix undefined reference to `__netdev_printk'
Applying: printk: add module parameter ignore_loglevel to control ignore_loglevel
Applying: printk: add ignore_loglevel as module parameter
Applying: printk: add console_suspend module parameter
Applying: printk: fix bounds checking for log_prefix
Applying: printk: remove bounds checking for log_prefix
Applying: treewide: use __printf not __attribute__((format(printf,...)))
Applying: treewide-use-__printf-not-__attribute__formatprintf-fix
Applying: treewide-use-__printf-not-__attribute__formatprintf-checkpatch-fixes
Applying: fs/namei.c: remove unused getname_flags()
Applying: poll: add poll_requested_events() function
Applying: MAINTAINERS: add new entry for ideapad-laptop
Applying: video/backlight: remove obsolete cleanup for clientdata
Applying: backlight: fix broken regulator API usage in l4f00242t03
Applying: drivers/video/backlight/l4f00242t03.c: use gpio_request_one() to simplify error handling
Applying: backlight: rename corgibl_limit_intensity() to genericbl_limit_intensity()
Applying: leds: Renesas TPU LED driver
Applying: leds-renesas-tpu-led-driver-v2-fix
Applying: drivers/leds/led-triggers.c: fix memory leak
Applying: drivers/leds/leds-lm3530.c: remove obsolete cleanup for clientdata
Applying: drivers/leds/leds-renesas-tpu.c: update driver to use workqueue
Applying: drivers/leds/leds-renesas-tpu.c: move Renesas TPU LED driver platform data
Applying: drivers/leds/leds-gpio.c: use gpio_get_value_cansleep() when initializing
Applying: lib/kstrtox: common code between kstrto*() and simple_strto*() functions
Applying: lib/spinlock_debug.c: print owner on spinlock lockup
Applying: lib/bitmap.c: quiet sparse noise about address space
Applying: lib-bitmapc-quiet-sparse-noise-about-address-space-fix
Applying: lib/percpu_counter.c: enclose hotplug only variables in hotplug ifdef
Applying: lib/idr.c: fix comment for ida_get_new_above()
Applying: llist: using in_nmi requires including hardirq.h
Applying: llist-return-whether-list-is-empty-before-adding-in-llist_add-fix
Applying: kernel.h/checkpatch: mark strict_strto<foo> and simple_strto<foo> as obsolete
Applying: lib/crc: add slice by 8 algorithm to crc32.c
Applying: lib-crc-add-slice-by-8-algorithm-to-crc32c-fix
Applying: epoll: fix spurious lockdep warnings
Applying: epoll: limit paths
Applying: binfmt_elf: fix PIE execution with randomization disabled
Applying: init/do_mounts_rd.c: fix ramdisk identification for padded cramfs
Applying: oprofilefs: handle zero-length writes
Applying: drivers/rtc/class.c: convert idr to ida and use ida_simple_get()
Applying: rtc: add initial support for mcp7941x parts
Applying: drivers/rtc/rtc-mc13xxx.c: move probe and remove callbacks to .init.text and .exit.text
Applying: minix: describe usage of different magic numbers
Applying: cgroups: more safe tasklist locking in cgroup_attach_proc
Applying: cgroups: don't attach task to subsystem if migration failed
Applying: cgroup/kmemleak: Annotate alloc_page() for cgroup allocations
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: memcg: rename mem variable to memcg
Applying: memcg: fix oom schedule_timeout()
Applying: memcg: replace ss->id_lock with a rwlock
Applying: memcg: do not expose uninitialized mem_cgroup_per_node to world
Applying: memcg: skip scanning active lists based on individual size
Applying: memcg-skip-scanning-active-lists-based-on-individual-size-fix
Applying: memcg: close race between charge and putback
Applying: memcg: Fix race condition in memcg_check_events() with this_cpu usage
Applying: cpusets: avoid looping when storing to mems_allowed if one node remains set
Applying: procfs: report EISDIR when reading sysctl dirs in proc
Applying: proc: fix races against execve() of /proc/PID/fd**
Applying: proc-fix-races-against-execve-of-proc-pid-fd-fix
Applying: proc: force dcache drop on unauthorized access
Applying: ipc-introduce-shm_rmid_forced-sysctl-testing
Applying: init: add root=PARTUUID=UUID/PARTNROFF=%d support
Applying: init-add-root=partuuid=uuid-partnroff=%d-support-fix
Applying: drivers/rapidio/rio-scan.c: use discovered bit to test if enumeration is complete
Applying: arch/powerpc/sysdev/fsl_rio.c: release rapidio port I/O region resource if port failed to initialize
Applying: RapidIO: add mport driver for Tsi721 bridge
Applying: RapidIO: Tsi721 driver - fixes for the initial release
Applying: RapidIO: fix potential null deref in rio_setup_device()
Applying: drivers/net/rionet.c: fix ethernet address macros for LE platforms
Applying: sysctl: add support for poll()
Applying: sysctl-add-support-for-poll-fix
Applying: sysctl: make CONFIG_SYSCTL_SYSCALL default to n
Applying: pps: default echo function
Applying: pps: new client driver using GPIO
Applying: pps-new-client-driver-using-gpio-fix
Applying: pps gpio client: add missing dependency
Applying: w1: ds2760 and ds2780, use ida for id and ida_simple_get() to get it
Applying: drivers/power/ds2780_battery.c: create central point for calling w1 interface
Applying: drivers/power/ds2780_battery.c: add a nolock function to w1 interface
Applying: drivers/power/ds2780_battery.c: fix deadlock upon insertion and removal
Applying: drivers/w1/w1_int.c: multiple masters used same init_name
Applying: aio: allocate kiocbs in batches
Applying: fs/direct-io.c: salcuate fs_count correctly in get_more_blocks()
Applying: dio: separate fields only used in the submission path from struct dio
Applying: dio-separate-fields-only-used-in-the-submission-path-from-struct-dio-checkpatch-fixes
Applying: dio: fix a wrong comment
Applying: dio: rearrange fields in dio/dio_submit to avoid holes
Applying: dio: use a slab cache for struct dio
Applying: dio: separate map_bh from dio
Applying: dio: inline the complete submission path
Applying: dio-inline-the-complete-submission-path-v2-checkpatch-fixes
Applying: dio: merge direct_io_walker() into __blockdev_direct_IO()
Applying: dio-merge-direct_io_walker-into-__blockdev_direct_io-checkpatch-fixes
Applying: dio: remove unnecessary dio argument from dio_pages_present()
Applying: dio: remove unused dio parameter from dio_bio_add_page()
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: ipc/mqueue: vlammoc requires vmalloc.h
Applying: cgroups: ERR_PTR needs err.h
Applying: include/linux/bio.h: use a static inline function for bio_integrity_clone()
Merging akpm
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: build warnings after merge of the writeback tree
From: Stephen Rothwell @ 2011-10-11 8:57 UTC (permalink / raw)
To: Wu Fengguang; +Cc: linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 648 bytes --]
Hi Wu,
After merging the writeback tree, today's linux-next build (powerpc
allnoconfig) produced these warnings:
mm/page-writeback.c: In function 'bdi_position_ratio':
mm/page-writeback.c:622:3: warning: comparison of distinct pointer types lacks a cast [enabled by default]
page-writeback.c:635:4: warning: comparison of distinct pointer types lacks a cast [enabled by default]
Introduced by commits 6c14ae1e92c7 ("writeback: dirty position control")
and 8927f66c4ede ("writeback: dirty position control - bdi reserve area").
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: build failure after merge of the moduleh tree
From: Stephen Rothwell @ 2011-10-11 8:39 UTC (permalink / raw)
To: Paul Gortmaker; +Cc: linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 2249 bytes --]
Hi Paul,
After merging the moduleh tree, today's linux-next build (x86_64 allmodconfig)
failed like this:
arch/x86/kernel/nmi.c:195:1: warning: data definition has no type or storage class [enabled by default]
arch/x86/kernel/nmi.c:195:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL' [-Wimplicit-int]
arch/x86/kernel/nmi.c:195:1: warning: parameter names (without types) in function declaration [enabled by default]
arch/x86/kernel/nmi.c:208:1: warning: data definition has no type or storage class [enabled by default]
arch/x86/kernel/nmi.c:208:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL' [-Wimplicit-int]
arch/x86/kernel/nmi.c:208:1: warning: parameter names (without types) in function declaration [enabled by default]
ERROR: "register_nmi_handler" [drivers/watchdog/hpwdt.ko] undefined!
ERROR: "unregister_nmi_handler" [drivers/watchdog/hpwdt.ko] undefined!
ERROR: "unregister_nmi_handler" [drivers/char/ipmi/ipmi_watchdog.ko] undefined!
ERROR: "register_nmi_handler" [drivers/char/ipmi/ipmi_watchdog.ko] undefined!
ERROR: "register_nmi_handler" [arch/x86/oprofile/oprofile.ko] undefined!
ERROR: "unregister_nmi_handler" [arch/x86/oprofile/oprofile.ko] undefined!
ERROR: "register_nmi_handler" [arch/x86/kernel/cpu/mcheck/mce-inject.ko] undefined!
Caused by commit 9c48f1c629ec ("x86, nmi: Wire up NMI handlers to new
routines") from the tip tree interacting with the modul.h split up.
I have added the following patch for today.
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 11 Oct 2011 19:36:20 +1100
Subject: [PATCH] x86, nmi: include export.h for EXPORT_SYBBOL
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
arch/x86/kernel/nmi.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/arch/x86/kernel/nmi.c b/arch/x86/kernel/nmi.c
index 7ec5bd1..b9c8628 100644
--- a/arch/x86/kernel/nmi.c
+++ b/arch/x86/kernel/nmi.c
@@ -17,6 +17,7 @@
#include <linux/delay.h>
#include <linux/hardirq.h>
#include <linux/slab.h>
+#include <linux/export.h>
#include <linux/mca.h>
--
1.7.6.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
* linux-next: build failure after merge of the moduleh tree
From: Stephen Rothwell @ 2011-10-11 8:25 UTC (permalink / raw)
To: Paul Gortmaker
Cc: linux-next, linux-kernel, "Heiko Stübner",
Mark Brown, Liam Girdwood
[-- Attachment #1: Type: text/plain, Size: 2141 bytes --]
Hi Paul,
After merging the moduleh tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/regulator/gpio-regulator.c: In function 'gpio_regulator_probe':
drivers/regulator/gpio-regulator.c:209:24: error: 'THIS_MODULE' undeclared (first use in this function)
drivers/regulator/gpio-regulator.c:209:24: note: each undeclared identifier is reported only once for each function it appears in
drivers/regulator/gpio-regulator.c: At top level:
drivers/regulator/gpio-regulator.c:338:13: error: 'THIS_MODULE' undeclared here (not in a function)
drivers/regulator/gpio-regulator.c:354:15: error: expected declaration specifiers or '...' before string constant
drivers/regulator/gpio-regulator.c:355:20: error: expected declaration specifiers or '...' before string constant
drivers/regulator/gpio-regulator.c:356:16: error: expected declaration specifiers or '...' before string constant
drivers/regulator/gpio-regulator.c:357:14: error: expected declaration specifiers or '...' before string constant
Caused by commit 3f0292ae8bb1 ("regulator: Add driver for gpio-controlled
regulators") from the regulator tree interacting with the module.h split
up.
I have applied the following patch for today. Mark, Liam, this should be
applied to the regulator tree.
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 11 Oct 2011 19:22:29 +1100
Subject: [PATCH] regulator: using module related services requires module.h
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/regulator/gpio-regulator.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/drivers/regulator/gpio-regulator.c b/drivers/regulator/gpio-regulator.c
index abf32ad..24d4477 100644
--- a/drivers/regulator/gpio-regulator.c
+++ b/drivers/regulator/gpio-regulator.c
@@ -31,6 +31,7 @@
#include <linux/gpio.h>
#include <linux/delay.h>
#include <linux/slab.h>
+#include <linux/module.h>
struct gpio_regulator_data {
struct regulator_desc desc;
--
1.7.6.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 hwspinlock tree with the arm-soc tree
From: Ohad Ben-Cohen @ 2011-10-11 8:15 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Kevin Hilman, Arnd Bergmann
In-Reply-To: <20111011190534.b3663a8392cc0905b6c4a466@canb.auug.org.au>
On Tue, Oct 11, 2011 at 10:05 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> I fixed it up (see below) and can carry the fix as necessary.
Looks good, Stephen, thanks a lot !
^ permalink raw reply
* linux-next: manual merge of the hwspinlock tree with the arm-soc tree
From: Stephen Rothwell @ 2011-10-11 8:05 UTC (permalink / raw)
To: Ohad Ben-Cohen; +Cc: linux-next, linux-kernel, Kevin Hilman, Arnd Bergmann
[-- Attachment #1: Type: text/plain, Size: 1300 bytes --]
Hi Ohad,
Today's linux-next merge of the hwspinlock tree got a conflict in
arch/arm/mach-omap2/hwspinlock.c between commit 3528c58eb9e8 ("OMAP:
omap_device: when building return platform_device instead of
omap_device") from the arm-soc tree and commit c3c1250e93a7
("hwspinlock/core/omap: fix id issues on multiple hwspinlock devices")
from the hwspinlock tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/mach-omap2/hwspinlock.c
index 0b3ae9d,eb7e509..0000000
--- a/arch/arm/mach-omap2/hwspinlock.c
+++ b/arch/arm/mach-omap2/hwspinlock.c
@@@ -48,13 -53,14 +53,14 @@@ int __init hwspinlocks_init(void
if (oh == NULL)
return -EINVAL;
- pdev = omap_device_build(dev_name, 0, oh, NULL, 0,
- od = omap_device_build(dev_name, 0, oh, &omap_hwspinlock_pdata,
++ pdev = omap_device_build(dev_name, 0, oh, &omap_hwspinlock_pdata,
+ sizeof(struct hwspinlock_pdata),
omap_spinlock_latency,
ARRAY_SIZE(omap_spinlock_latency), false);
- if (IS_ERR(od)) {
+ if (IS_ERR(pdev)) {
pr_err("Can't build omap_device for %s:%s\n", dev_name,
oh_name);
- retval = PTR_ERR(od);
+ retval = PTR_ERR(pdev);
}
return retval;
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: linux-next: build failure after merge of the gpio tree
From: Tomoya MORINAGA @ 2011-10-11 7:02 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Grant Likely, linux-next, linux-kernel, Tomoya MORINAGA
In-Reply-To: <20111011173714.d54bbcee6c0676ddcc37a1f3@canb.auug.org.au>
(2011/10/11 15:37), Stephen Rothwell wrote:
> Hi Grant,
>
> On Thu, 6 Oct 2011 14:48:26 +1100 Stephen Rothwell<sfr@canb.auug.org.au> wrote:
>>
>> After merging the gpio tree, today's linux-next build (x86_64
>> allmodconfig) failed like this:
>>
>> ERROR: "irq_setup_generic_chip" [drivers/gpio/gpio-pch.ko] undefined!
>> ERROR: "irq_alloc_generic_chip" [drivers/gpio/gpio-pch.ko] undefined!
>> ERROR: "irq_setup_generic_chip" [drivers/gpio/gpio-ml-ioh.ko] undefined!
>> ERROR: "irq_alloc_generic_chip" [drivers/gpio/gpio-ml-ioh.ko] undefined!
>>
>> Presumably caused by commits 54be566317b6 ("gpio-ml-ioh: Support
>> interrupt function") and 38eb18a6f92d ("gpio-pch: Support interrupt
>> function").
>>
>> I have used the gpio tree from next-20111005 for today.
>
> I am still getting this build failure.
>
I built this driver with success using linux-3.0.
I want to try to build with the same as your build environment.
Where can I get your environment ?
Thanks,
--
tomoya
ROHM Co., Ltd.
^ permalink raw reply
* Re: linux-next: build failure after merge of the gpio tree
From: Stephen Rothwell @ 2011-10-11 6:37 UTC (permalink / raw)
To: Grant Likely; +Cc: linux-next, linux-kernel, Tomoya MORINAGA
In-Reply-To: <20111006144826.a69a5ea59d4ca94f8f7414cf@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 872 bytes --]
Hi Grant,
On Thu, 6 Oct 2011 14:48:26 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the gpio tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> ERROR: "irq_setup_generic_chip" [drivers/gpio/gpio-pch.ko] undefined!
> ERROR: "irq_alloc_generic_chip" [drivers/gpio/gpio-pch.ko] undefined!
> ERROR: "irq_setup_generic_chip" [drivers/gpio/gpio-ml-ioh.ko] undefined!
> ERROR: "irq_alloc_generic_chip" [drivers/gpio/gpio-ml-ioh.ko] undefined!
>
> Presumably caused by commits 54be566317b6 ("gpio-ml-ioh: Support
> interrupt function") and 38eb18a6f92d ("gpio-pch: Support interrupt
> function").
>
> I have used the gpio tree from next-20111005 for today.
I am still getting this build failure.
--
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: build failure after merge of the tip tree
From: Stephen Rothwell @ 2011-10-11 6:15 UTC (permalink / raw)
To: Peter Zijlstra
Cc: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, linux-next,
linux-kernel, Huang Ying, David Miller, netdev
In-Reply-To: <1317804373.6766.0.camel@twins>
[-- Attachment #1: Type: text/plain, Size: 1495 bytes --]
Hi all,
On Wed, 05 Oct 2011 10:46:13 +0200 Peter Zijlstra <peterz@infradead.org> wrote:
>
> On Wed, 2011-10-05 at 17:25 +1100, Stephen Rothwell wrote:
> >
> > After merging the tip tree, today's linux-next build (x86_64 allmodconfig)
> > failed like this:
> >
> > net/rds/ib_rdma.c: In function 'rds_ib_reuse_fmr':
> > net/rds/ib_rdma.c:272:2: error: implicit declaration of function 'llist_del_first' [-Werror=implicit-function-declaration]
> > net/rds/ib_rdma.c:272:6: warning: assignment makes pointer from integer without a cast [enabled by default]
> > net/rds/ib_rdma.c: In function 'rds_ib_flush_mr_pool':
> > net/rds/ib_rdma.c:671:4: error: implicit declaration of function 'llist_add_batch' [-Werror=implicit-function-declaration]
> > cc1: some warnings being treated as errors
> >
> > Caused by commit 1230db8e1543 ("llist: Make some llist functions inline")
> > interacting with commit 1bc144b62524 ("net, rds, Replace xlist in
> > net/rds/xlist.h with llist") from the net tree. The former commit
> > removes the declarations of llist_del_first() and llist_add_batch() with
> > no explanation (and probably by accident since the definitions still
> > exist).
>
> Ugh yes, my bad. Ingo objected to inlining all those functions and I
> then screwed up. There are no users of those two functions in my tree.
So can we have that fixed, please?
--
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 sound tree with the arm-soc tree
From: Ujfalusi, Peter @ 2011-10-11 6:15 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Takashi Iwai, linux-next, linux-kernel, Liam Girdwood,
Misael Lopez Cruz, Mark Brown, Jarkko Nikula, Tony Lindgren,
Arnd Bergmann
In-Reply-To: <20111011154304.f7fefc4f7f86b4b10348578c@canb.auug.org.au>
Hi Stephen,
On Tue, Oct 11, 2011 at 7:43 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Takashi,
>
> Today's linux-next merge of the sound tree got a conflict in
> arch/arm/plat-omap/devices.c between commit 40246e0003f0 ("ARM: OMAP:
> mcbsp: Move out omap_mcbsp_register_board_cfg from plat-omap/devices")
> from the arm-soc tree and commit d231f5cbac9e ("OMAP: McPDM: Convert
> McPDM device to omap_device") from the sound tree.
>
> Just overlapping removals. I fixed it up (see below) and can carry the
> fix as necessary.
Thanks, the McBSP change came via linux-omap while we had the McPDM
changes coming via sound tree.
>
> Mark, Liam: That sound tree commit has a few Signed-off-by lines with no
> email addresses.
I can not track their new contact information. They used to work for TI, and I
have been advised to give them credit for their work on this area.
I could have added no longer valid email addresses...
--
Péter
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
>
> diff --cc arch/arm/plat-omap/devices.c
> index acd132c,40eca9b..0000000
> --- a/arch/arm/plat-omap/devices.c
> +++ b/arch/arm/plat-omap/devices.c
> @@@ -24,44 -24,56 +24,11 @@@
> #include <plat/tc.h>
> #include <plat/board.h>
> #include <plat/mmc.h>
> -#include <mach/gpio.h>
> #include <plat/menelaus.h>
> -#include <plat/mcbsp.h>
> #include <plat/omap44xx.h>
>
> - #if defined(CONFIG_SND_OMAP_SOC_MCPDM) || \
> - defined(CONFIG_SND_OMAP_SOC_MCPDM_MODULE)
> -
> - static struct resource mcpdm_resources[] = {
> - {
> - .name = "mcpdm_mem",
> - .start = OMAP44XX_MCPDM_BASE,
> - .end = OMAP44XX_MCPDM_BASE + SZ_4K,
> - .flags = IORESOURCE_MEM,
> - },
> - {
> - .name = "mcpdm_irq",
> - .start = OMAP44XX_IRQ_MCPDM,
> - .end = OMAP44XX_IRQ_MCPDM,
> - .flags = IORESOURCE_IRQ,
> - },
> - };
> -
> - static struct platform_device omap_mcpdm_device = {
> - .name = "omap-mcpdm",
> - .id = -1,
> - .num_resources = ARRAY_SIZE(mcpdm_resources),
> - .resource = mcpdm_resources,
> - };
> -
> - static void omap_init_mcpdm(void)
> - {
> - (void) platform_device_register(&omap_mcpdm_device);
> - }
> - #else
> - static inline void omap_init_mcpdm(void) {}
> - #endif
> -
> /*-------------------------------------------------------------------------*/
>
> -#if defined(CONFIG_OMAP_MCBSP) || defined(CONFIG_OMAP_MCBSP_MODULE)
> -
> -static struct platform_device **omap_mcbsp_devices;
> -
> -void omap_mcbsp_register_board_cfg(struct resource *res, int res_count,
> - struct omap_mcbsp_platform_data *config, int size)
> -{
> - int i;
> -
> - omap_mcbsp_devices = kzalloc(size * sizeof(struct platform_device *),
> - GFP_KERNEL);
> - if (!omap_mcbsp_devices) {
> - printk(KERN_ERR "Could not register McBSP devices\n");
> - return;
> - }
> -
> - for (i = 0; i < size; i++) {
> - struct platform_device *new_mcbsp;
> - int ret;
> -
> - new_mcbsp = platform_device_alloc("omap-mcbsp", i + 1);
> - if (!new_mcbsp)
> - continue;
> - platform_device_add_resources(new_mcbsp, &res[i * res_count],
> - res_count);
> - new_mcbsp->dev.platform_data = &config[i];
> - ret = platform_device_add(new_mcbsp);
> - if (ret) {
> - platform_device_put(new_mcbsp);
> - continue;
> - }
> - omap_mcbsp_devices[i] = new_mcbsp;
> - }
> -}
> -
> -#else
> -void omap_mcbsp_register_board_cfg(struct resource *res, int res_count,
> - struct omap_mcbsp_platform_data *config, int size)
> -{ }
> -#endif
> -
> -/*-------------------------------------------------------------------------*/
> -
> #if defined(CONFIG_MMC_OMAP) || defined(CONFIG_MMC_OMAP_MODULE) || \
> defined(CONFIG_MMC_OMAP_HS) || defined(CONFIG_MMC_OMAP_HS_MODULE)
>
>
^ permalink raw reply
* linux-next: manual merge of the omap_dss2 tree with the arm-soc tree
From: Stephen Rothwell @ 2011-10-11 5:50 UTC (permalink / raw)
To: Tomi Valkeinen; +Cc: linux-next, linux-kernel, Tony Lindgren
[-- Attachment #1: Type: text/plain, Size: 2100 bytes --]
Hi Tomi,
Today's linux-next merge of the omap_dss2 tree got a conflict in
arch/arm/mach-omap2/board-h4.c between commit be7324605873 ("ARM: OMAP2+:
Remove custom init_irq for remaining boards") from the arm-soc tree and
commit cbf1455bfc9f ("OMAP: H4: Port the display driver to new DSS2")
from the omap_dss2 tree.
Just context changes If fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/mach-omap2/board-h4.c
index a65effe,f7c09de..0000000
--- a/arch/arm/mach-omap2/board-h4.c
+++ b/arch/arm/mach-omap2/board-h4.c
@@@ -285,10 -301,17 +300,6 @@@ static struct omap_usb_config h4_usb_co
.hmc_mode = 0x00, /* 0:dev|otg 1:disable 2:disable */
};
- static struct omap_board_config_kernel h4_config[] __initdata = {
- { OMAP_TAG_LCD, &h4_lcd_config },
- };
-
-static void __init omap_h4_init_early(void)
-{
- omap2_init_common_infrastructure();
- omap2_init_common_devices(NULL, NULL);
-}
-
-static void __init omap_h4_init_irq(void)
-{
- omap2_init_irq();
-}
-
static struct at24_platform_data m24c01 = {
.byte_len = SZ_1K / 8,
.page_size = 16,
@@@ -359,17 -379,24 +367,19 @@@ static void __init omap_h4_init(void
platform_add_devices(h4_devices, ARRAY_SIZE(h4_devices));
omap2_usbfs_init(&h4_usb_config);
omap_serial_init();
+ omap_sdrc_init(NULL, NULL);
h4_init_flash();
+
+ omap_display_init(&h4_dss_data);
}
-static void __init omap_h4_map_io(void)
-{
- omap2_set_globals_242x();
- omap242x_map_common_io();
-}
-
MACHINE_START(OMAP_H4, "OMAP2420 H4 board")
/* Maintainer: Paul Mundt <paul.mundt@nokia.com> */
- .boot_params = 0x80000100,
+ .atag_offset = 0x100,
.reserve = omap_reserve,
- .map_io = omap_h4_map_io,
- .init_early = omap_h4_init_early,
- .init_irq = omap_h4_init_irq,
+ .map_io = omap242x_map_io,
+ .init_early = omap2420_init_early,
+ .init_irq = omap2_init_irq,
.init_machine = omap_h4_init,
.timer = &omap2_timer,
MACHINE_END
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: linux-next: build failure after merge of the md tree
From: NeilBrown @ 2011-10-11 5:42 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel
In-Reply-To: <20111011162948.c3ca0fc8726a7d7b80e39744@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 5426 bytes --]
On Tue, 11 Oct 2011 16:29:48 +1100 Stephen Rothwell <sfr@canb.auug.org.au>
wrote:
> Hi Neil,
>
> After merging the md tree, today's linux-next build (x86_64_allmodconfig)
> failed like this:
>
> drivers/md/dm-raid.c:597:25: error: unknown type name 'mdk_rdev_t'
> drivers/md/dm-raid.c:614:24: error: unknown type name 'mddev_t'
> drivers/md/dm-raid.c:614:40: error: unknown type name 'mdk_rdev_t'
> drivers/md/dm-raid.c:654:23: error: unknown type name 'mdk_rdev_t'
> drivers/md/dm-raid.c:654:41: error: unknown type name 'mdk_rdev_t'
> drivers/md/dm-raid.c:692:34: error: unknown type name 'mddev_t'
> drivers/md/dm-raid.c:692:50: error: unknown type name 'mdk_rdev_t'
> drivers/md/dm-raid.c:812:27: error: unknown type name 'mddev_t'
> drivers/md/dm-raid.c:812:43: error: unknown type name 'mdk_rdev_t'
> drivers/md/dm-raid.c: In function 'analyse_superblocks':
> drivers/md/dm-raid.c:852:2: error: unknown type name 'mdk_rdev_t'
> drivers/md/dm-raid.c:853:2: error: unknown type name 'mddev_t'
> drivers/md/dm-raid.c:853:19: warning: initialization from incompatible pointer type [enabled by default]
> drivers/md/dm-raid.c:856:2: error: request for member 'same_set' in something not a structure or union
> drivers/md/dm-raid.c:856:2: error: request for member 'disks' in something not a structure or union
> drivers/md/dm-raid.c:856:2: error: request for member 'same_set' in something not a structure or union
> drivers/md/dm-raid.c:856:2: error: request for member 'same_set' in something not a structure or union
> drivers/md/dm-raid.c:856:2: error: request for member 'same_set' in something not a structure or union
> drivers/md/dm-raid.c:856:2: error: request for member 'same_set' in something not a structure or union
> drivers/md/dm-raid.c:856:2: warning: left-hand operand of comma expression has no effect [-Wunused-value]
> drivers/md/dm-raid.c:856:2: error: request for member 'same_set' in something not a structure or union
> drivers/md/dm-raid.c:856:2: error: request for member 'disks' in something not a structure or union
> drivers/md/dm-raid.c:856:2: error: request for member 'same_set' in something not a structure or union
> drivers/md/dm-raid.c:856:2: error: request for member 'same_set' in something not a structure or union
> drivers/md/dm-raid.c:856:2: error: request for member 'same_set' in something not a structure or union
> drivers/md/dm-raid.c:857:12: error: request for member 'meta_bdev' in something not a structure or union
> drivers/md/dm-raid.c:860:3: error: implicit declaration of function 'super_load' [-Werror=implicit-function-declaration]
> drivers/md/dm-raid.c:882:2: error: implicit declaration of function 'super_validate' [-Werror=implicit-function-declaration]
> drivers/md/dm-raid.c:885:2: error: request for member 'same_set' in something not a structure or union
> drivers/md/dm-raid.c:885:2: error: request for member 'disks' in something not a structure or union
> drivers/md/dm-raid.c:885:2: error: request for member 'same_set' in something not a structure or union
> drivers/md/dm-raid.c:885:2: error: request for member 'same_set' in something not a structure or union
> drivers/md/dm-raid.c:885:2: error: request for member 'same_set' in something not a structure or union
> drivers/md/dm-raid.c:885:2: error: request for member 'same_set' in something not a structure or union
> drivers/md/dm-raid.c:885:2: warning: left-hand operand of comma expression has no effect [-Wunused-value]
> drivers/md/dm-raid.c:885:2: error: request for member 'same_set' in something not a structure or union
> drivers/md/dm-raid.c:885:2: error: request for member 'disks' in something not a structure or union
> drivers/md/dm-raid.c:885:2: error: request for member 'same_set' in something not a structure or union
> drivers/md/dm-raid.c:885:2: error: request for member 'same_set' in something not a structure or union
> drivers/md/dm-raid.c:885:2: error: request for member 'same_set' in something not a structure or union
> drivers/md/dm-raid.c: In function 'raid_ctr':
> drivers/md/dm-raid.c:965:22: error: 'super_sync' undeclared (first use in this function)
> drivers/md/dm-raid.c:965:22: note: each undeclared identifier is reported only once for each function it appears in
> drivers/md/dm-raid.c: In function 'raid_status':
> drivers/md/dm-raid.c:1100:4: error: unknown type name 'raid5_conf_t'
> drivers/md/dm-raid.c:1103:4: error: request for member 'max_nr_stripes' in something not a structure or union
> drivers/md/dm-raid.c: In function 'raid_io_hints':
> drivers/md/dm-raid.c:1149:2: error: unknown type name 'raid5_conf_t'
> drivers/md/dm-raid.c:1152:46: error: request for member 'raid_disks' in something not a structure or union
> drivers/md/dm-raid.c:1152:65: error: request for member 'max_degraded' in something not a structure or union
>
> Caused by commits 4251a3bcf0e1 ("md: removing typedefs: mdk_rdev_t ->
> struct md_rdev") and 724d5bc7708a ("md: remove typedefs: mddev_t ->
> struct mddev").
>
> Have you dropped better versions of these commits? Please build test.
I'll add dm-raid back in to my build testing - I don't know why it dropped
out.
This will be fixed for tomorrow.
I might add the merge with the block layer too.
Thanks,
NeilBrown
>
> I have used the version of the tree from next-20111006 since
> next-20111007 had another build problem.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 828 bytes --]
^ permalink raw reply
* linux-next: manual merge of the mfd tree with the arm-soc tree
From: Stephen Rothwell @ 2011-10-11 5:41 UTC (permalink / raw)
To: Samuel Ortiz
Cc: linux-next, linux-kernel, "Philippe Rétornaz",
Sascha Hauer, Arnd Bergmann, Uwe Kleine-König
[-- Attachment #1: Type: text/plain, Size: 923 bytes --]
Hi Samuel,
Today's linux-next merge of the mfd tree got a conflict in
arch/arm/mach-imx/mach-mx31moboard.c between commit 40d97b89bd3c
("mx31moboard: Add poweroff support") from the arm-soc tree and commit
1ab50c862862 ("ARM: imx/mx31moboard: Add mc13783 power button support")
from the mfd 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/arm/mach-imx/mach-mx31moboard.c
index fff7791,f7e302d..0000000
--- a/arch/arm/mach-imx/mach-mx31moboard.c
+++ b/arch/arm/mach-imx/mach-mx31moboard.c
@@@ -28,9 -28,7 +28,10 @@@
#include <linux/spi/spi.h>
#include <linux/types.h>
#include <linux/memblock.h>
+#include <linux/clk.h>
+#include <linux/io.h>
+#include <linux/err.h>
+ #include <linux/input.h>
#include <linux/usb/otg.h>
#include <linux/usb/ulpi.h>
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: build failure after merge of the md tree
From: Stephen Rothwell @ 2011-10-11 5:29 UTC (permalink / raw)
To: Neil Brown; +Cc: linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 5087 bytes --]
Hi Neil,
After merging the md tree, today's linux-next build (x86_64_allmodconfig)
failed like this:
drivers/md/dm-raid.c:597:25: error: unknown type name 'mdk_rdev_t'
drivers/md/dm-raid.c:614:24: error: unknown type name 'mddev_t'
drivers/md/dm-raid.c:614:40: error: unknown type name 'mdk_rdev_t'
drivers/md/dm-raid.c:654:23: error: unknown type name 'mdk_rdev_t'
drivers/md/dm-raid.c:654:41: error: unknown type name 'mdk_rdev_t'
drivers/md/dm-raid.c:692:34: error: unknown type name 'mddev_t'
drivers/md/dm-raid.c:692:50: error: unknown type name 'mdk_rdev_t'
drivers/md/dm-raid.c:812:27: error: unknown type name 'mddev_t'
drivers/md/dm-raid.c:812:43: error: unknown type name 'mdk_rdev_t'
drivers/md/dm-raid.c: In function 'analyse_superblocks':
drivers/md/dm-raid.c:852:2: error: unknown type name 'mdk_rdev_t'
drivers/md/dm-raid.c:853:2: error: unknown type name 'mddev_t'
drivers/md/dm-raid.c:853:19: warning: initialization from incompatible pointer type [enabled by default]
drivers/md/dm-raid.c:856:2: error: request for member 'same_set' in something not a structure or union
drivers/md/dm-raid.c:856:2: error: request for member 'disks' in something not a structure or union
drivers/md/dm-raid.c:856:2: error: request for member 'same_set' in something not a structure or union
drivers/md/dm-raid.c:856:2: error: request for member 'same_set' in something not a structure or union
drivers/md/dm-raid.c:856:2: error: request for member 'same_set' in something not a structure or union
drivers/md/dm-raid.c:856:2: error: request for member 'same_set' in something not a structure or union
drivers/md/dm-raid.c:856:2: warning: left-hand operand of comma expression has no effect [-Wunused-value]
drivers/md/dm-raid.c:856:2: error: request for member 'same_set' in something not a structure or union
drivers/md/dm-raid.c:856:2: error: request for member 'disks' in something not a structure or union
drivers/md/dm-raid.c:856:2: error: request for member 'same_set' in something not a structure or union
drivers/md/dm-raid.c:856:2: error: request for member 'same_set' in something not a structure or union
drivers/md/dm-raid.c:856:2: error: request for member 'same_set' in something not a structure or union
drivers/md/dm-raid.c:857:12: error: request for member 'meta_bdev' in something not a structure or union
drivers/md/dm-raid.c:860:3: error: implicit declaration of function 'super_load' [-Werror=implicit-function-declaration]
drivers/md/dm-raid.c:882:2: error: implicit declaration of function 'super_validate' [-Werror=implicit-function-declaration]
drivers/md/dm-raid.c:885:2: error: request for member 'same_set' in something not a structure or union
drivers/md/dm-raid.c:885:2: error: request for member 'disks' in something not a structure or union
drivers/md/dm-raid.c:885:2: error: request for member 'same_set' in something not a structure or union
drivers/md/dm-raid.c:885:2: error: request for member 'same_set' in something not a structure or union
drivers/md/dm-raid.c:885:2: error: request for member 'same_set' in something not a structure or union
drivers/md/dm-raid.c:885:2: error: request for member 'same_set' in something not a structure or union
drivers/md/dm-raid.c:885:2: warning: left-hand operand of comma expression has no effect [-Wunused-value]
drivers/md/dm-raid.c:885:2: error: request for member 'same_set' in something not a structure or union
drivers/md/dm-raid.c:885:2: error: request for member 'disks' in something not a structure or union
drivers/md/dm-raid.c:885:2: error: request for member 'same_set' in something not a structure or union
drivers/md/dm-raid.c:885:2: error: request for member 'same_set' in something not a structure or union
drivers/md/dm-raid.c:885:2: error: request for member 'same_set' in something not a structure or union
drivers/md/dm-raid.c: In function 'raid_ctr':
drivers/md/dm-raid.c:965:22: error: 'super_sync' undeclared (first use in this function)
drivers/md/dm-raid.c:965:22: note: each undeclared identifier is reported only once for each function it appears in
drivers/md/dm-raid.c: In function 'raid_status':
drivers/md/dm-raid.c:1100:4: error: unknown type name 'raid5_conf_t'
drivers/md/dm-raid.c:1103:4: error: request for member 'max_nr_stripes' in something not a structure or union
drivers/md/dm-raid.c: In function 'raid_io_hints':
drivers/md/dm-raid.c:1149:2: error: unknown type name 'raid5_conf_t'
drivers/md/dm-raid.c:1152:46: error: request for member 'raid_disks' in something not a structure or union
drivers/md/dm-raid.c:1152:65: error: request for member 'max_degraded' in something not a structure or union
Caused by commits 4251a3bcf0e1 ("md: removing typedefs: mdk_rdev_t ->
struct md_rdev") and 724d5bc7708a ("md: remove typedefs: mddev_t ->
struct mddev").
Have you dropped better versions of these commits? Please build test.
I have used the version of the tree from next-20111006 since
next-20111007 had another build problem.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: manual merge of the sound tree with the arm-soc tree
From: Stephen Rothwell @ 2011-10-11 4:43 UTC (permalink / raw)
To: Takashi Iwai
Cc: linux-next, linux-kernel, Peter Ujfalusi, Liam Girdwood,
Misael Lopez Cruz, Mark Brown, Jarkko Nikula, Tony Lindgren,
Arnd Bergmann
[-- Attachment #1: Type: text/plain, Size: 3259 bytes --]
Hi Takashi,
Today's linux-next merge of the sound tree got a conflict in
arch/arm/plat-omap/devices.c between commit 40246e0003f0 ("ARM: OMAP:
mcbsp: Move out omap_mcbsp_register_board_cfg from plat-omap/devices")
from the arm-soc tree and commit d231f5cbac9e ("OMAP: McPDM: Convert
McPDM device to omap_device") from the sound tree.
Just overlapping removals. I fixed it up (see below) and can carry the
fix as necessary.
Mark, Liam: That sound tree commit has a few Signed-off-by lines with no
email addresses.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/plat-omap/devices.c
index acd132c,40eca9b..0000000
--- a/arch/arm/plat-omap/devices.c
+++ b/arch/arm/plat-omap/devices.c
@@@ -24,44 -24,56 +24,11 @@@
#include <plat/tc.h>
#include <plat/board.h>
#include <plat/mmc.h>
-#include <mach/gpio.h>
#include <plat/menelaus.h>
-#include <plat/mcbsp.h>
#include <plat/omap44xx.h>
- #if defined(CONFIG_SND_OMAP_SOC_MCPDM) || \
- defined(CONFIG_SND_OMAP_SOC_MCPDM_MODULE)
-
- static struct resource mcpdm_resources[] = {
- {
- .name = "mcpdm_mem",
- .start = OMAP44XX_MCPDM_BASE,
- .end = OMAP44XX_MCPDM_BASE + SZ_4K,
- .flags = IORESOURCE_MEM,
- },
- {
- .name = "mcpdm_irq",
- .start = OMAP44XX_IRQ_MCPDM,
- .end = OMAP44XX_IRQ_MCPDM,
- .flags = IORESOURCE_IRQ,
- },
- };
-
- static struct platform_device omap_mcpdm_device = {
- .name = "omap-mcpdm",
- .id = -1,
- .num_resources = ARRAY_SIZE(mcpdm_resources),
- .resource = mcpdm_resources,
- };
-
- static void omap_init_mcpdm(void)
- {
- (void) platform_device_register(&omap_mcpdm_device);
- }
- #else
- static inline void omap_init_mcpdm(void) {}
- #endif
-
/*-------------------------------------------------------------------------*/
-#if defined(CONFIG_OMAP_MCBSP) || defined(CONFIG_OMAP_MCBSP_MODULE)
-
-static struct platform_device **omap_mcbsp_devices;
-
-void omap_mcbsp_register_board_cfg(struct resource *res, int res_count,
- struct omap_mcbsp_platform_data *config, int size)
-{
- int i;
-
- omap_mcbsp_devices = kzalloc(size * sizeof(struct platform_device *),
- GFP_KERNEL);
- if (!omap_mcbsp_devices) {
- printk(KERN_ERR "Could not register McBSP devices\n");
- return;
- }
-
- for (i = 0; i < size; i++) {
- struct platform_device *new_mcbsp;
- int ret;
-
- new_mcbsp = platform_device_alloc("omap-mcbsp", i + 1);
- if (!new_mcbsp)
- continue;
- platform_device_add_resources(new_mcbsp, &res[i * res_count],
- res_count);
- new_mcbsp->dev.platform_data = &config[i];
- ret = platform_device_add(new_mcbsp);
- if (ret) {
- platform_device_put(new_mcbsp);
- continue;
- }
- omap_mcbsp_devices[i] = new_mcbsp;
- }
-}
-
-#else
-void omap_mcbsp_register_board_cfg(struct resource *res, int res_count,
- struct omap_mcbsp_platform_data *config, int size)
-{ }
-#endif
-
-/*-------------------------------------------------------------------------*/
-
#if defined(CONFIG_MMC_OMAP) || defined(CONFIG_MMC_OMAP_MODULE) || \
defined(CONFIG_MMC_OMAP_HS) || defined(CONFIG_MMC_OMAP_HS_MODULE)
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: build failure after merge of the infiniband tree
From: Stephen Rothwell @ 2011-10-11 3:49 UTC (permalink / raw)
To: Roland Dreier, linux-rdma
Cc: linux-next, linux-kernel, Faisal Latif, Tatyana Nikolova
[-- Attachment #1: Type: text/plain, Size: 1071 bytes --]
Hi all,
After merging the infiniband tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/infiniband/hw/nes/nes_mgt.c: In function 'get_fpdu_info':
drivers/infiniband/hw/nes/nes_mgt.c:328:3: error: 'NES_DBG_PAU' undeclared (first use in this function)
drivers/infiniband/hw/nes/nes_mgt.c:328:3: note: each undeclared identifier is reported only once for each function it appears in
drivers/infiniband/hw/nes/nes_mgt.c: In function 'nes_chg_qh_handler':
drivers/infiniband/hw/nes/nes_mgt.c:664:4: error: 'NES_DBG_PAU' undeclared (first use in this function)
drivers/infiniband/hw/nes/nes_mgt.c: In function 'nes_change_quad_hash':
drivers/infiniband/hw/nes/nes_mgt.c:728:3: error: 'NES_DBG_PAU' undeclared (first use in this function)
Caused by commit cf3fbdf123bf ("RDMA/nes: Support for Packed And
Unaligned fpdus"). Please build tes ...
I have used the version of the infiniband tree from next-20111007 for today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: manual merge of the hid tree with Linus' tree
From: Stephen Rothwell @ 2011-10-11 3:37 UTC (permalink / raw)
To: Jiri Kosina
Cc: linux-next, linux-kernel, David Herrmann, Bastien Nocera,
Jason Gerecke, Dmitry Torokhov
[-- Attachment #1: Type: text/plain, Size: 2090 bytes --]
Hi Jiri,
Today's linux-next merge of the hid tree got a conflict in
drivers/hid/hid-wacom.c between commit 3512069eefd3 ("Input: wacom - add
POINTER and DIRECT device properties") from Linus' tree and commit
3797ef6b6bc0 ("HID: wacom: Set input bits before registration") from the
hid tree.
I fixed it up (maybe - see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/hid/hid-wacom.c
index 72ca689,519f56c..0000000
--- a/drivers/hid/hid-wacom.c
+++ b/drivers/hid/hid-wacom.c
@@@ -304,6 -304,46 +304,48 @@@ static int wacom_raw_event(struct hid_d
return 1;
}
+ static int wacom_input_mapped(struct hid_device *hdev, struct hid_input *hi,
+ struct hid_field *field, struct hid_usage *usage, unsigned long **bit,
+ int *max)
+ {
+ struct input_dev *input = hi->input;
+
++ __set_bit(INPUT_PROP_POINTER, input->propbit);
++
+ /* Basics */
+ input->evbit[0] |= BIT(EV_KEY) | BIT(EV_ABS) | BIT(EV_REL);
+
+ __set_bit(REL_WHEEL, input->relbit);
+
+ __set_bit(BTN_TOOL_PEN, input->keybit);
+ __set_bit(BTN_TOUCH, input->keybit);
+ __set_bit(BTN_STYLUS, input->keybit);
+ __set_bit(BTN_STYLUS2, input->keybit);
+ __set_bit(BTN_LEFT, input->keybit);
+ __set_bit(BTN_RIGHT, input->keybit);
+ __set_bit(BTN_MIDDLE, input->keybit);
+
+ /* Pad */
+ input->evbit[0] |= BIT(EV_MSC);
+
+ __set_bit(MSC_SERIAL, input->mscbit);
+
+ __set_bit(BTN_0, input->keybit);
+ __set_bit(BTN_1, input->keybit);
+ __set_bit(BTN_TOOL_FINGER, input->keybit);
+
+ /* Distance, rubber and mouse */
+ __set_bit(BTN_TOOL_RUBBER, input->keybit);
+ __set_bit(BTN_TOOL_MOUSE, input->keybit);
+
+ input_set_abs_params(input, ABS_X, 0, 16704, 4, 0);
+ input_set_abs_params(input, ABS_Y, 0, 12064, 4, 0);
+ input_set_abs_params(input, ABS_PRESSURE, 0, 511, 0, 0);
+ input_set_abs_params(input, ABS_DISTANCE, 0, 32, 0, 0);
+
+ return 0;
+ }
+
static int wacom_probe(struct hid_device *hdev,
const struct hid_device_id *id)
{
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: manual merge of the s5p tree with the arm tree
From: Stephen Rothwell @ 2011-10-11 2:07 UTC (permalink / raw)
To: Kukjin Kim
Cc: linux-next, linux-kernel, Arnd Bergmann, Russell King, Boojin Kim,
Vinod Koul, Abhilash Kesavan
[-- Attachment #1: Type: text/plain, Size: 1018 bytes --]
Hi Kukjin,
Today's linux-next merge of the s5p tree got a conflict in
arch/arm/mach-exynos4/Kconfig between commit 15e0d9e37c7f ("ARM: pm: let
platforms select cpu_suspend support") from the arm tree and commits
bf856fbb5e10 ("ARM: EXYNOS4: Use generic DMA PL330 driver"), 0da3beadcbed
("ARM: S5P: Make the common S5P PM code conditionally compile") and
e2e13621b267 ("ARM: S5P: Make the sleep code common for S5P series SoCs")
from the s5p tree.
I did the obvious fixup (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/mach-exynos4/Kconfig
index a652735,dd660eb..0000000
--- a/arch/arm/mach-exynos4/Kconfig
+++ b/arch/arm/mach-exynos4/Kconfig
@@@ -11,8 -11,9 +11,10 @@@ if ARCH_EXYNOS
config CPU_EXYNOS4210
bool
- select S3C_PL330_DMA
+ select SAMSUNG_DMADEV
+ select S5P_PM if PM
+ select S5P_SLEEP if PM
+ select ARM_CPU_SUSPEND if PM
help
Enable EXYNOS4210 CPU support
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: [PATCH -next] infiniband: fix ipath_chip_init.c build errors
From: Stephen Rothwell @ 2011-10-11 0:33 UTC (permalink / raw)
To: Roland Dreier
Cc: Randy Dunlap, linux-next, LKML, Mike Marciniszyn, linux-rdma,
Andrew Morton
In-Reply-To: <CAL1RGDWXV2=cYTRAvKuZbquOPS7n-p3NJkYnrzyK_ZAbKsJy6A@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 451 bytes --]
On Mon, 10 Oct 2011 12:02:29 -0700 Roland Dreier <roland@purestorage.com> wrote:
>
> On Fri, Oct 7, 2011 at 3:05 PM, Randy Dunlap <rdunlap@xenotime.net> wrote:
> > First I saw it was in today's linux-next (20111007).
>
> Got it... a latent problem exposed by some include clean up, probably.
Almost certainly the module.h split up.
--
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 -next] infiniband: fix ipath_chip_init.c build errors
From: Roland Dreier @ 2011-10-10 19:02 UTC (permalink / raw)
To: Randy Dunlap
Cc: Stephen Rothwell, linux-next, LKML, Mike Marciniszyn, linux-rdma,
Andrew Morton
In-Reply-To: <4E8F77B8.3000805@xenotime.net>
On Fri, Oct 7, 2011 at 3:05 PM, Randy Dunlap <rdunlap@xenotime.net> wrote:
> First I saw it was in today's linux-next (20111007).
Got it... a latent problem exposed by some include clean up, probably.
Applied, thanks.
^ 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