* Re: linux-next: build failure after merge of the iommu tree
From: Joerg Roedel @ 2011-08-29 10:42 UTC (permalink / raw)
To: Ohad Ben-Cohen; +Cc: Stephen Rothwell, linux-next, linux-kernel
In-Reply-To: <CAK=WgbbukmB_HBmfdzt9SQhHyQBbjKYb8xPZPB-vq6Pwu9gFQA@mail.gmail.com>
On Mon, Aug 29, 2011 at 08:11:53AM +0300, Ohad Ben-Cohen wrote:
> Thank you, Stephen, you're completely right of course.
>
> Here is what we're missing (patch also attached):
>
> >From 7a7949ca60bb0d58079b669733f9aa43015ba0f0 Mon Sep 17 00:00:00 2001
> From: Ohad Ben-Cohen <ohad@wizery.com>
> Date: Mon, 29 Aug 2011 07:57:44 +0300
> Subject: [PATCH] iommu: omap: add Kconfig OMAP dependency
>
> Make CONFIG_OMAP_IOMMU depend on CONFIG_ARCH_OMAP so other
> allmodconfig builds won't fail.
>
> Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
> Signed-off-by: Ohad Ben-Cohen <ohad@wizery.com>
> ---
> drivers/iommu/Kconfig | 1 +
> 1 files changed, 1 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig
> index 432463b..d901930 100644
> --- a/drivers/iommu/Kconfig
> +++ b/drivers/iommu/Kconfig
> @@ -110,6 +110,7 @@ config INTR_REMAP
> # OMAP IOMMU support
> config OMAP_IOMMU
> bool "OMAP IOMMU Support"
> + depends on ARCH_OMAP
> select IOMMU_API
>
> config OMAP_IOVMM
Applied to arm/omap and pushed into my next branch, Thanks.
Joerg
^ permalink raw reply
* Re: linux-next: manual merge of the arm-soc tree with the arm tree
From: Linus Walleij @ 2011-08-29 9:17 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Arnd Bergmann, linux-next, linux-kernel, Sascha Hauer,
Russell King
In-Reply-To: <20110829110435.e7f2a6ae1637a6b13f2c5874@canb.auug.org.au>
On Mon, Aug 29, 2011 at 3:04 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Arnd,
>
> Today's linux-next merge of the arm-soc tree got a conflict in
> arch/arm/mach-u300/Makefile.boot between commit 74b84ad6c1a5 ("ARM:
> 7022/1: allow to detect conflicting zreladdrs") from the arm tree and
> commit 732851465445 ("mach-u300: retire odd singlemem variant") from the
> arm-soc tree.
>
> I fixed it up (see below) and can carry the fix as necessary.
Looks correct, and it's one of the unavoidable things as we clean up
the ARM tree, thanks a lot Stephen!
Yours,
Linus Walleij
^ permalink raw reply
* Re: linux-next: build failure after merge of the iommu tree
From: Joerg Roedel @ 2011-08-29 8:36 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Ohad Ben-Cohen
In-Reply-To: <20110829133237.80467b5d54438ace53b324df@canb.auug.org.au>
On Mon, Aug 29, 2011 at 01:32:37PM +1000, Stephen Rothwell wrote:
> After merging the iommu tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/iommu/omap-iommu.c:27:24: fatal error: plat/iommu.h: No such file or directory
>
> Caused by commit fcf3a6ef4a58 ("omap: iommu/iovmm: move to dedicated
> iommu folder"). Presumably building of this code should be restricted to
> just some platforms only.
>
> I have dropped the iommu tree for today (since I have no older working
> version).
Thanks for the report Stephen, I apply Ohads patch today so that this
should be fixed for tomorrow.
Joerg
^ permalink raw reply
* Re: linux-next: build failure after merge of the scsi tree
From: Giridhar Malavali @ 2011-08-29 8:07 UTC (permalink / raw)
To: James Bottomley, Stephen Rothwell
Cc: linux-next@vger.kernel.org, linux-kernel, Chad Dupuis
In-Reply-To: <1314602256.5038.1.camel@dabdike>
>>
>On Mon, 2011-08-29 at 12:09 +1000, Stephen Rothwell wrote:
>> Hi James,
>>
>> After merging the scsi tree, today's linux-next build (powerpc
>> ppc64_defconfig) failed like this:
>>
>> drivers/scsi/qla2xxx/qla_nx.c: In function 'qla82xx_md_alloc':
>> drivers/scsi/qla2xxx/qla_nx.c:4815:2: error: implicit declaration of
>>function 'vmalloc'
>> drivers/scsi/qla2xxx/qla_nx.c:4815:14: warning: assignment makes
>>pointer from integer without a cast
>> drivers/scsi/qla2xxx/qla_nx.c: In function 'qla82xx_md_free':
>> drivers/scsi/qla2xxx/qla_nx.c:4845:3: error: implicit declaration of
>>function 'vfree'
>>
>> Caused by commit b60bb5832c00 ("[SCSI] qla2xxx: Add support for ISP82xx
>> to capture dump (minidump) on failure"). Missing include of
>> linux/vmalloc.h. See Rule 1 in Documentation/SubmitChecklist.
>>
>> I have used the scsi tree from next-20110826 for today.
>
>Thanks for finding the problem. I updated the commit with a simple fix
>and re-pushed.
Thanks James and Stephen for finding and fixing this problem. I will make
sure that such issues won't happen in future.
-- Giri
>
>James
>
>
>
^ permalink raw reply
* Re: linux-next: Tree for Aug 29
From: Stephen Rothwell @ 2011-08-29 7:19 UTC (permalink / raw)
To: sedat.dilek; +Cc: Sedat Dilek, linux-next, LKML
In-Reply-To: <CA+icZUWHaVCaBwPm0+A9=2hfY8xOjRFM3XJ6_tOqSyKun-MOQA@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 395 bytes --]
Hi Sedat,
On Mon, 29 Aug 2011 08:52:29 +0200 Sedat Dilek <sedat.dilek@googlemail.com> wrote:
>
> Might be time to store next patch in .../v3.x/next/ or a new own
> http://www.kernel.org/pub/linux/kernel/next/ upload-dir?
I have already asked for a chnge, but not response :-(
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* Re: linux-next: build failure after merge of the scsi tree
From: James Bottomley @ 2011-08-29 7:17 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Giridhar Malavali, Chad Dupuis
In-Reply-To: <20110829120902.f95a92022c2d9170defdc083@canb.auug.org.au>
On Mon, 2011-08-29 at 12:09 +1000, Stephen Rothwell wrote:
> Hi James,
>
> After merging the scsi tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
>
> drivers/scsi/qla2xxx/qla_nx.c: In function 'qla82xx_md_alloc':
> drivers/scsi/qla2xxx/qla_nx.c:4815:2: error: implicit declaration of function 'vmalloc'
> drivers/scsi/qla2xxx/qla_nx.c:4815:14: warning: assignment makes pointer from integer without a cast
> drivers/scsi/qla2xxx/qla_nx.c: In function 'qla82xx_md_free':
> drivers/scsi/qla2xxx/qla_nx.c:4845:3: error: implicit declaration of function 'vfree'
>
> Caused by commit b60bb5832c00 ("[SCSI] qla2xxx: Add support for ISP82xx
> to capture dump (minidump) on failure"). Missing include of
> linux/vmalloc.h. See Rule 1 in Documentation/SubmitChecklist.
>
> I have used the scsi tree from next-20110826 for today.
Thanks for finding the problem. I updated the commit with a simple fix
and re-pushed.
James
^ permalink raw reply
* Re: linux-next: Tree for Aug 29
From: Sedat Dilek @ 2011-08-29 6:52 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, LKML
In-Reply-To: <20110829161907.19232776e65389dea1caa7e8@canb.auug.org.au>
On Mon, Aug 29, 2011 at 8:19 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> The powerpc allyesconfig build still fails today.
>
> Changes since 20110826:
>
> New tree: iommu
>
> Dropped tree: iommu (build failure)
>
> Linus' tree gained build failures for which I applied 2 patches.
>
> The arm-soc tree gained a conflict against the arm tree.
>
> The scsi tree gained a build failure, so I used the version from
> next-20110826.
>
> The net tree lost 2 conflicts.
>
> The iommu tree gained a build failure so I dropped it.
>
> I have still reverted the x86/spinlocks branch from the tip tree for
> today.
>
> The driver-core tree gained a conflict against the arm-soc tree.
>
> The tty tree lost its build failure.
>
> The moduleh tree lost 2 conflicts.
>
> The akpm tree gained conflicts agains Linus' tree - I dropped several
> patches that had been merged upstream.
>
> ----------------------------------------------------------------------------
>
> 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/ ).
Might be time to store next patch in .../v3.x/next/ or a new own
http://www.kernel.org/pub/linux/kernel/next/ upload-dir?
- Sedat -
^ permalink raw reply
* linux-next: Tree for Aug 29
From: Stephen Rothwell @ 2011-08-29 6:19 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 22094 bytes --]
Hi all,
The powerpc allyesconfig build still fails today.
Changes since 20110826:
New tree: iommu
Dropped tree: iommu (build failure)
Linus' tree gained build failures for which I applied 2 patches.
The arm-soc tree gained a conflict against the arm tree.
The scsi tree gained a build failure, so I used the version from
next-20110826.
The net tree lost 2 conflicts.
The iommu tree gained a build failure so I dropped it.
I have still reverted the x86/spinlocks branch from the tip tree for
today.
The driver-core tree gained a conflict against the arm-soc tree.
The tty tree lost its build failure.
The moduleh tree lost 2 conflicts.
The akpm tree gained conflicts agains Linus' tree - I dropped several
patches that had been merged upstream.
----------------------------------------------------------------------------
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 28 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
Applying: remove remaining references to nfsservctl
Merging kbuild-current/rc-fixes
Merging arm-current/master
Merging m68k-current/for-linus
Merging powerpc-merge/merge
Merging 52xx-and-virtex-current/powerpc/merge
Merging sparc-current/master
Merging scsi-rc-fixes/master
Merging net-current/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-curent/master
Merging dwmw2/master
Merging sh-current/sh-fixes-for-linus
Merging rmobile-current/rmobile-fixes-for-linus
Merging fbdev-current/fbdev-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/pgalloc.h
CONFLICT (content): Merge conflict in arch/arm/include/asm/pgtable.h
CONFLICT (content): Merge conflict in arch/arm/include/asm/tlb.h
CONFLICT (content): Merge conflict in arch/arm/kernel/head.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 (content): Merge conflict in arch/arm/mach-u300/Makefile.boot
Merging at91/at91-next
Merging davinci/davinci-next
Merging i.MX/for-next
Merging linux-spec/for-next
Merging msm/for-next
CONFLICT (content): Merge conflict in arch/arm/mach-msm/io.c
Merging omap/for-next
Merging pxa/for-next
Merging samsung/next-samsung
Merging s5p/for-next
Merging tegra/for-next
Merging ux500-core/ux500-core
Merging xilinx/arm-next
Merging blackfin/for-linus
Merging cris/for-next
Merging ia64/test
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/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
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-core.c
CONFLICT (content): Merge conflict in drivers/hid/hid-ids.h
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 ide/master
Merging libata/NEXT
Merging infiniband/for-next
Merging acpi/test
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
$ git reset --hard HEAD^
Merging refs/next/20110826/scsi
Merging iscsi-target/for-next
Merging slave-dma/next
CONFLICT (content): Merge conflict in drivers/dma/amba-pl08x.c
Merging async_tx/next
Merging net/master
CONFLICT (delete/modify): arch/powerpc/configs/40x/hcu4_defconfig deleted in HEAD and modified in net/master. Version net/master of arch/powerpc/configs/40x/hcu4_defconfig left in tree.
$ git rm -f arch/powerpc/configs/40x/hcu4_defconfig
Merging wireless/master
Merging bluetooth/master
Merging mtd/master
Merging l2-mtd/master
CONFLICT (content): Merge conflict in drivers/mtd/maps/lantiq-flash.c
Merging crypto/master
Merging sound/for-next
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
Merging kgdb/kgdb-next
Merging slab/for-next
Merging uclinux/for-next
Merging md/for-next
Merging mfd/for-next
Merging hdlc/hdlc-next
Merging drm/drm-next
Merging fbdev/master
Merging viafb/viafb-next
Merging omap_dss2/for-next
Merging voltage/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
$ git reset --hard HEAD^
Merging cputime/cputime
Merging osd/linux-next
Merging jc_docs/docs-next
Merging nommu/master
Merging trivial/for-next
Merging audit/for-next
Merging pm/linux-next
CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/board-ap4evb.c
CONFLICT (content): Merge conflict in arch/s390/include/asm/thread_info.h
CONFLICT (content): Merge conflict in drivers/mfd/twl4030-irq.c
Merging apm/for-next
Merging fsnotify/for-next
Merging irda/for-next
Merging i7core_edac/linux_next
Merging i7300_edac/linux_next
CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/mcheck/mce.c
Merging devicetree/devicetree/next
CONFLICT (content): Merge conflict in drivers/of/base.c
Merging spi/spi/next
Merging gpio/gpio/next
Merging tip/auto-latest
CONFLICT (content): Merge conflict in arch/x86/mm/fault.c
[master efd12f4] Revert "Merge branch 'x86/spinlocks' into auto-latest"
Merging rcu/rcu/next
Merging kvm/linux-next
Merging oprofile/for-next
Merging ptrace/ptrace
Merging xen/upstream/xen
Merging xen-two/linux-next
Merging xen-pvhvm/linux-next
Merging edac-amd/for-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
Merging driver-core/driver-core-next
CONFLICT (content): Merge conflict in arch/arm/plat-mxc/devices.c
Merging tty/tty-next
Merging usb/usb-next
CONFLICT (content): Merge conflict in drivers/usb/host/xhci-ring.c
Merging staging/staging-next
CONFLICT (content): Merge conflict in drivers/staging/brcm80211/brcmsmac/types.h
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
$ git rm -f drivers/staging/rtl8192e/r8192E_core.c
Merging bkl-config/config
Merging tmem/linux-next
Merging writeback/next
Merging arm-dt/devicetree/arm-next
Merging moduleh/module.h-split
CONFLICT (content): Merge conflict in arch/arm/mach-bcmring/mm.c
CONFLICT (content): Merge conflict in include/linux/dmaengine.h
Applying: dm: use export.h instead of module.h where possible
Applying: block: bsg-lib.c needs export.h not module.h
Applying: PM: EXPORT_SYMBOL needs export.h
Merging kvmtool/master
CONFLICT (content): Merge conflict in include/net/9p/9p.h
Merging scsi-post-merge/merge-base:master
$ git checkout akpm
Applying: Because of x86-implement-strict-user-copy-checks-for-x86_64.patch
Applying: When no floppy is found the module code can be released while a timer
Applying: Fix kconfig unmet dependency warning. BACKLIGHT_CLASS_DEVICE depends on
Applying: Fix the following memory leak:
Applying: The parameter's origin type is long. On an i386 architecture, it can
Applying: Since the commit below which added O_PATH support to the *at() calls, the
Applying: Add support for Aspire 1410 BIOS v1.3314. Fixes the following error:
Applying: This makes the iris driver use the platform API, so it is properly exposed
Applying: On x86_32 casting the unsigned int result of get_random_int() to long may
Applying: This new driver replaces the old PCEngines Alix 2/3 LED driver with a new
Applying: Cc: Ed Wildgoose <git@wildgooses.com>
Applying: Replace the bubble sort in sanitize_e820_map() with a call to the generic
Applying: The x86 timer interrupt handler is the only handler not traced in the
Applying: The current interrupt traces from irq_handler_entry and irq_handler_exit
Applying: Don't allow everybody to use a modem.
Applying: The address limit is already set in flush_old_exec() so this
Applying: A call to va_copy() should always be followed by a call to va_end() in the
Applying: Don't dereference em if it's NULL or an error pointer.
Applying: Some messing with error codes to return 0 on out id's and match
Applying: kbuf is a buffer that is local to this function, so all of the error paths
Applying: fb_set_suspend() must be called with the console semaphore held, which
Applying: hwmon was using an idr with a NULL pointer, so convert to an
Applying: A straightforward looking use of idr for a device id.
Applying: This patchset aims at addressing /proc/stat issue which has been
Applying: update_ts_time_stat currently updates idle time even if we are in iowait
Applying: get_cpu_{idle,iowait}_time_us update idle/iowait counters unconditionally
Applying: show_stat handler of the /proc/stat file relies on kstat_cpu(cpu)
Applying: The address limit is already set in flush_old_exec() so this
Applying: The address limit is already set in flush_old_exec() so this
Applying: Add new check (assert_init) to make sure objects are initialized and
Applying: del_timer_sync() calls debug_object_assert_init() to assert that a timer
Applying: ext4_{set,clear}_bit() is defined as __test_and_{set,clear}_bit_le() for
Applying: The dqc_bitmap field of struct ocfs2_local_disk_chunk is 32-bit aligned,
Applying: The address limit is already set in flush_old_exec() so those calls to
Applying: When do pci remove/rescan on system that have more iommus, got
Applying: The current implementation of dmi_name_in_vendors() is an invitation to
Applying: For headers that get exported to userland and make use of u32 style
Applying: Fix sparse warnings of right shift bigger than source value size:
Applying: We leak in drivers/scsi/aacraid/commctrl.c::aac_send_raw_srb() :
Applying: Some mangling of errors was necessary to maintain current interface.
Applying: This does involve additional use of the spin lock in idr.c. Is this an
Applying: Instead of open coding this function use kstrtoul_from_user() directly.
Applying: brd_make_request() always returns 0, which doesn't make much sense.
Applying: The address limit is already set in flush_old_exec() so this assignment of
Applying: Unbreak the alpha build.
Applying: Unbreak alpha build.
Applying: Unbreak alpha build.
Applying: When we get corruption reports, it's useful to see if the kernel was
Applying: When we get corruption reports, it's useful to see if the kernel was
Applying: The basic idea behind cross memory attach is to allow MPI programs doing
Applying: - Add x86_64 specific wire up
Applying: > You might get some speed benefit by optimising for the small copies
Applying: acct_isolated of compaction uses page_lru_base_type which returns only
Applying: Change ISOLATE_XXX macro with bitwise isolate_mode_t type. Normally,
Applying: In async mode, compaction doesn't migrate dirty or writeback pages. So,
Applying: In __zone_reclaim case, we don't want to shrink mapped page. Nonetheless,
Applying: unmap_and_move() is one a big messy function. Clean it up.
Applying: radix_tree_tag_get()'s BUG (when it sees a tag after saw_unset_tag) was
Applying: per-task block plug can reduce block queue lock contention and increase
Applying: The tracing ring-buffer used this function briefly, but not anymore.
Applying: After selecting a task to kill, the oom killer iterates all processes and
Applying: Add the leading word "tmpfs" to the Kconfig string to make it blindingly
Applying: When we get a bad_page bug report, it's useful to see what modules the
Applying: Without swap, anonymous pages are not scanned. As such, they should not
Applying: fix comment
Applying: The nr_force_scan[] tuple holds the effective scan numbers for anon and
Applying: Some kernel components pin user space memory (infiniband and perf) (by
Applying: Add comments to explain the page statistics field in the mm_struct.
Applying: add missing ;
Applying: Testing from the XFS folk revealed that there is still too much I/O from
Applying: Lumpy reclaim worked with two passes - the first which queued pages for IO
Applying: Direct reclaim should never writeback pages. For now, handle the
Applying: Direct reclaim should never writeback pages. Warn if an attempt is made.
Applying: It is preferable that no dirty pages are dispatched for cleaning from the
Applying: Workloads that are allocating frequently and writing files place a large
Applying: When direct reclaim encounters a dirty page, it gets recycled around the
Applying: It's possible a zone watermark is ok when entering the balance_pgdat()
Applying: printk_ratelimit() should not be used, because it shares ratelimiting
Applying: memchr_inv() is mainly used to check whether the whole buffer is filled
Applying: Use newly introduced memchr_inv() for page verification.
Applying: A shrinker function can return -1, means that it cannot do anything
Applying: Use atomic-long operations instead of looping around cmpxchg().
Applying: massage atomic.h inclusions
Applying: The /proc/vmallocinfo shows information about vmalloc allocations in
Applying: Commit 645747462435 ("vmscan: detect mapped file pages used only once")
Applying: Logic added in commit 8cab4754d24a0 ("vmscan: make mapped executable pages
Applying: SPARC32 require access to the start address. Add a new helper
Applying: With the NO_BOOTMEM symbol added architectures may now use the following
Applying: Using "- 1" relies on the old_end to be page aligned and PAGE_SIZE > 1,
Applying: This replaces ptep_clear_flush() with ptep_get_and_clear() and a single
Applying: This adds THP support to mremap (decreases the number of split_huge_page()
Applying: coding-style nitpicking
Applying: Cc: Andrea Arcangeli <aarcange@redhat.com>
Applying: Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Applying: vmstat_text is only available when PROC_FS or SYSFS is enabled. This
Applying: reduce ifdeffery
Applying: Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Applying: Make the security_inode_init_security() initxattrs arg const, to match the
Applying: The current implementation of the /dev/hpet driver couples opening the
Applying: smp_call_function() only lets all other CPUs execute a specific function,
Applying: auto_demotion_disable is called only for online CPUs. For hotplugged
Applying: Enabling DEBUG_STRICT_USER_COPY_CHECKS causes the following warning:
Applying: Strict user copy checks are only really supported on x86_32 even though
Applying: The help text for this config is duplicated across the x86, parisc, and
Applying: s/lib-/obj-/ for usercopy.o
Applying: After an "unexpected" reboot, I found this Oops in my logs:
Applying: In the move of the lis3 driver, the hp_accel.c file got dropped from the
Applying: Add axis correction for HP EliteBook 2730p.
Applying: Add axis correction for HP EliteBook 8540w.
Applying: Add axis correction for HP ProBook 6555b.
Applying: Adapt the help text for CONFIG_HP_ACCEL to the move of
Applying: Signed-off-by: Ilkka Koskinen <ilkka.koskinen@nokia.com>
Applying: Signed-off-by: Ilkka Koskinen <ilkka.koskinen@nokia.com>
Applying: Change exported functions to use the device given as parameter
Applying: Signed-off-by: Ilkka Koskinen <ilkka.koskinen@nokia.com>
Applying: We are enabling some power features on medfield. To test suspend-2-RAM
Applying: We are enabling some power features on medfield. To test suspend-2-RAM
Applying: We are enabling some power features on medfield. To test suspend-2-RAM
Applying: Cc: Al Viro <viro@zeniv.linux.org.uk>
Applying: Add V2 of the LED driver for a single timer channel for the TPU hardware
Applying: include linux/module.h
Applying: The memory for struct led_trigger should be kfreed in the
Applying: Currently termination logic (\0 or \n\0) is hardcoded in _kstrtoull(),
Applying: Add support for slice by 8 to existing crc32 algorithm. Also modify
Applying: don't include asm/msr.h
Applying: epoll can acquire recursively acquire ep->mtx on multiple "struct
Applying: Currently in oprofilefs, files that use ulong_fops mis-handle writes of
Applying: This is the one use of an ida that doesn't retry on receiving -EAGAIN.
Applying: One can get this information from minix/inode.c, but adding the
Applying: The memcg code sometimes uses "struct mem_cgroup *mem" and sometimes uses
Applying: Before calling schedule_timeout(), task state should be changed.
Applying: Signed-off-by: Bob Liu <lliubbo@gmail.com>
Applying: While back-porting Johannes Weiner's patch "mm: memcg-aware global
Applying: If somebody is touching data too early, it might be easier to diagnose a
Applying: Both mem_cgroup_charge_statistics() and mem_cgroup_move_account() were
Applying: On reading sysctl dirs we should return -EISDIR instead of -EINVAL.
Applying: Force this on for -next/mm testing purposes.
Applying: Expand root=PARTUUID=UUID syntax to support selecting a root partition by
Applying: After merging the akpm tree, today's linux-next build (lost of them)
Applying: The discovered bit in PGCCSR register indicates if the device has been
Applying: Add RapidIO mport driver for IDT TSI721 PCI Express-to-SRIO bridge device.
Applying: When I tried to send a patch to remove it, Andi told me we still need to
Applying: Signed-off-by: WANG Cong <amwang@redhat.com>
Applying: Signed-off-by: WANG Cong <amwang@redhat.com>
Applying: Signed-off-by: WANG Cong <amwang@redhat.com>
Applying: This is only an error, no need to use KERN_CRIT log level.
Applying: Signed-off-by: WANG Cong <amwang@redhat.com>
Applying: ERROR: code indent should use tabs where possible
Applying: A default echo function has been provided so it is no longer an error when
Applying: This client driver allows you to use a GPIO pin as a source for PPS
Applying: remove unneeded cast of void*
Applying: Straightforward. As an aside, the ida_init calls are not needed as far as
Applying: Simply creates one point to call the w1 interface.
Applying: Adds a nolock function to the w1 interface to avoid locking the
Applying: Fixes the deadlock when inserting and removing the ds2780.
Merging akpm
Applying: sparc: Remove another reference to nfsservctl
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* Re: linux-next tree addition request (fbdev)
From: Paul Mundt @ 2011-08-29 6:02 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Florian Tobias Schandinat, linux-next,
linux-fbdev@vger.kernel.org
In-Reply-To: <20110829021930.0112cf98fbafd7380e09e164@canb.auug.org.au>
On Mon, Aug 29, 2011 at 02:19:30AM +1000, Stephen Rothwell wrote:
> Hi Florian,
>
> On Thu, 25 Aug 2011 00:33:53 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > On Wed, 24 Aug 2011 13:40:46 +0000 Florian Tobias Schandinat <FlorianSchandinat@gmx.de> wrote:
> > >
> > > can you please add
> > >
> > > git://github.com/schandinat/linux-2.6.git fbdev-next
> > >
> > > to linux-next. It collects patches for the frame buffer subsystem.
> > > Can you please add the linux-fbdev@vger.kernel.org mailing list as additional
> > > contact for warnings/errors/problems?
> > >
> > > You probably want to drop Paul's fbdev branches as they contain some outdated
> > > patches that will conflict with the newer versions.
> >
> > OK, Paul is still listed as the frame buffer subsystem maintainer, so I
> > will need an Ack from him. When I get that, I will replace his tree with
> > yours. I assume someone will update the MAINTAINERS file.
> >
> > I also have another tree from Paul (called fbdev-current) that contained
> > fixes for Linus' current release. I also assume that that tree will be
> > dropped (unless you have a new version of that as well).
>
> Ping? Anyone?
>
As long as Florian is taking care of the backlog of the stuff that is
already sitting in that branch, I have no problems with it being dropped.
I'm not planning on pushing any updates to it anyways.
^ permalink raw reply
* Re: linux-next: manual merge of the scsi-post-merge tree with the akpm tree
From: Stephen Rothwell @ 2011-08-29 5:54 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-next, linux-kernel, Sergei Trofimovich
In-Reply-To: <20110829151909.d5a9c3897af3830c70ae2d2a@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 197 bytes --]
Hi Andrew,
This was, of course a conflict between the akpm tree and Linus' tree ...
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* linux-next: build failure after merge of the final tree (linus' tree related)
From: Stephen Rothwell @ 2011-08-29 5:47 UTC (permalink / raw)
To: Linus; +Cc: linux-next, linux-kernel, NeilBrown, J. Bruce Fields,
David S. Miller
Hi Linus,
After merging the final tree, today's linux-next build (sparc64 defconfig)
failed like this:
arch/sparc/kernel/head_64.o: In function `sys_call_table32':
(.text+0x223f8): undefined reference to `sys32_nfsservctl'
Presumably caused by commit f5b940997397 ("All Arch: remove linkage for
sys_nfsservctl system call") from Linus' tree.
I have applied this patch for today:
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 29 Aug 2011 15:43:40 +1000
Subject: [PATCH] sparc: Remove another reference to nfsservctl
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
arch/sparc/kernel/systbls_64.S | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/sparc/kernel/systbls_64.S b/arch/sparc/kernel/systbls_64.S
index c9296ab..edbec45 100644
--- a/arch/sparc/kernel/systbls_64.S
+++ b/arch/sparc/kernel/systbls_64.S
@@ -68,7 +68,7 @@ sys_call_table32:
.word compat_sys_fstatfs64, sys_llseek, sys_mlock, sys_munlock, sys32_mlockall
/*240*/ .word sys_munlockall, sys32_sched_setparam, sys32_sched_getparam, sys32_sched_setscheduler, sys32_sched_getscheduler
.word sys_sched_yield, sys32_sched_get_priority_max, sys32_sched_get_priority_min, sys32_sched_rr_get_interval, compat_sys_nanosleep
-/*250*/ .word sys_mremap, compat_sys_sysctl, sys32_getsid, sys_fdatasync, sys32_nfsservctl
+/*250*/ .word sys_mremap, compat_sys_sysctl, sys32_getsid, sys_fdatasync, sys_nis_syscall
.word sys32_sync_file_range, compat_sys_clock_settime, compat_sys_clock_gettime, compat_sys_clock_getres, sys32_clock_nanosleep
/*260*/ .word compat_sys_sched_getaffinity, compat_sys_sched_setaffinity, sys32_timer_settime, compat_sys_timer_gettime, sys_timer_getoverrun
.word sys_timer_delete, compat_sys_timer_create, sys_ni_syscall, compat_sys_io_setup, sys_io_destroy
--
1.7.5.4
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
^ permalink raw reply related
* linux-next: build warning after merge of the ptrace tree
From: Stephen Rothwell @ 2011-08-29 5:27 UTC (permalink / raw)
To: Tejun Heo, Oleg Nesterov; +Cc: linux-next, linux-kernel, Matt Fleming
[-- Attachment #1: Type: text/plain, Size: 417 bytes --]
Hi all,
After merging the ptrace tree, today's linux-next build (powerpc
ppc64_defconfig) produced this warning:
fs/autofs4/waitq.c: In function 'autofs4_wait':
fs/autofs4/waitq.c:462:17: warning: unused variable 'irqflags'
Introduced by commit 33ee1d9bc213 ("autofs4: Use set_current_blocked()").
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* linux-next: manual merge of the akpm with Linus' tree
From: Stephen Rothwell @ 2011-08-29 5:22 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-next, linux-kernel, WANG Cong
[-- Attachment #1: Type: text/plain, Size: 484 bytes --]
Hi Andrew,
Today's linux-next merge of the scsi-post-merge tree got a conflict in
arch/cris/include/asm/serial.h between commit 02016bc0381c ("cris: add
arch/cris/include/asm/serial.h") from Linus' tree and commit f8b20ed71f1b
("Fix the following build errors:") from the akpm tree.
There former appears to be a later version of the latter, so I dropped
the latter.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* linux-next: manual merge of the scsi-post-merge tree with the akpm tree
From: Stephen Rothwell @ 2011-08-29 5:19 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-next, linux-kernel, Sergei Trofimovich
[-- Attachment #1: Type: text/plain, Size: 527 bytes --]
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in
arch/alpha/kernel/osf_sys.c between commit 2df7a7d1cd07 ("alpha: unbreak
osf_setsysinfo(SSI_NVPAIRS, [SSIN_UACPROC, UAC_SIGBUS])") from the tree
and commit db52f8af5ea5 ("The bug was accidentally found by the following
program:") from the akpm tree.
The former appears to be a later version of the latter, so I have dropped
the latter.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* Re: linux-next: build failure after merge of the iommu tree
From: Ohad Ben-Cohen @ 2011-08-29 5:11 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Joerg Roedel, linux-next, linux-kernel
In-Reply-To: <20110829133237.80467b5d54438ace53b324df@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1411 bytes --]
On Mon, Aug 29, 2011 at 6:32 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> After merging the iommu tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/iommu/omap-iommu.c:27:24: fatal error: plat/iommu.h: No such file or directory
>
> Caused by commit fcf3a6ef4a58 ("omap: iommu/iovmm: move to dedicated
> iommu folder"). Presumably building of this code should be restricted to
> just some platforms only.
Thank you, Stephen, you're completely right of course.
Here is what we're missing (patch also attached):
>From 7a7949ca60bb0d58079b669733f9aa43015ba0f0 Mon Sep 17 00:00:00 2001
From: Ohad Ben-Cohen <ohad@wizery.com>
Date: Mon, 29 Aug 2011 07:57:44 +0300
Subject: [PATCH] iommu: omap: add Kconfig OMAP dependency
Make CONFIG_OMAP_IOMMU depend on CONFIG_ARCH_OMAP so other
allmodconfig builds won't fail.
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Ohad Ben-Cohen <ohad@wizery.com>
---
drivers/iommu/Kconfig | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig
index 432463b..d901930 100644
--- a/drivers/iommu/Kconfig
+++ b/drivers/iommu/Kconfig
@@ -110,6 +110,7 @@ config INTR_REMAP
# OMAP IOMMU support
config OMAP_IOMMU
bool "OMAP IOMMU Support"
+ depends on ARCH_OMAP
select IOMMU_API
config OMAP_IOVMM
--
1.7.4.1
[-- Attachment #2: 0001-iommu-omap-add-Kconfig-OMAP-dependency.patch --]
[-- Type: text/x-patch, Size: 815 bytes --]
From 7a7949ca60bb0d58079b669733f9aa43015ba0f0 Mon Sep 17 00:00:00 2001
From: Ohad Ben-Cohen <ohad@wizery.com>
Date: Mon, 29 Aug 2011 07:57:44 +0300
Subject: [PATCH] iommu: omap: add Kconfig OMAP dependency
Make CONFIG_OMAP_IOMMU depend on CONFIG_ARCH_OMAP so other
allmodconfig builds won't fail.
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Ohad Ben-Cohen <ohad@wizery.com>
---
drivers/iommu/Kconfig | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig
index 432463b..d901930 100644
--- a/drivers/iommu/Kconfig
+++ b/drivers/iommu/Kconfig
@@ -110,6 +110,7 @@ config INTR_REMAP
# OMAP IOMMU support
config OMAP_IOMMU
bool "OMAP IOMMU Support"
+ depends on ARCH_OMAP
select IOMMU_API
config OMAP_IOVMM
--
1.7.4.1
^ permalink raw reply related
* linux-next: manual merge of the driver-core tree with the arm-soc tree
From: Stephen Rothwell @ 2011-08-29 4:31 UTC (permalink / raw)
To: Greg KH
Cc: linux-next, linux-kernel, "Uwe Kleine-König",
Arnd Bergmann
Hi Greg,
Today's linux-next merge of the driver-core tree got a conflict in
arch/arm/plat-mxc/devices.c between commit 160a84cfc975 ("ARM: mxc: drop
now unused function mxc_register_device") from the arm-soc tree and
commit 0e392412f334 ("ARM: mxc: convert device creation to use
platform_device_register_full") from the driver-core tree.
Just context changes. I fixed it up (see below) anc can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/plat-mxc/devices.c
index 5aaa8c5,a34b2ae..0000000
--- a/arch/arm/plat-mxc/devices.c
+++ b/arch/arm/plat-mxc/devices.c
@@@ -23,59 -23,20 +23,6 @@@
#include <linux/platform_device.h>
#include <mach/common.h>
- struct platform_device *__init imx_add_platform_device_dmamask(
- const char *name, int id,
- const struct resource *res, unsigned int num_resources,
- const void *data, size_t size_data, u64 dmamask)
- {
- int ret = -ENOMEM;
- struct platform_device *pdev;
-
- pdev = platform_device_alloc(name, id);
- if (!pdev)
- goto err;
-
- if (dmamask) {
- /*
- * This memory isn't freed when the device is put,
- * I don't have a nice idea for that though. Conceptually
- * dma_mask in struct device should not be a pointer.
- * See http://thread.gmane.org/gmane.linux.kernel.pci/9081
- */
- pdev->dev.dma_mask =
- kmalloc(sizeof(*pdev->dev.dma_mask), GFP_KERNEL);
- if (!pdev->dev.dma_mask)
- /* ret is still -ENOMEM; */
- goto err;
-
- *pdev->dev.dma_mask = dmamask;
- pdev->dev.coherent_dma_mask = dmamask;
- }
-
- if (res) {
- ret = platform_device_add_resources(pdev, res, num_resources);
- if (ret)
- goto err;
- }
-
- if (data) {
- ret = platform_device_add_data(pdev, data, size_data);
- if (ret)
- goto err;
- }
-
- ret = platform_device_add(pdev);
- if (ret) {
- err:
- if (dmamask)
- kfree(pdev->dev.dma_mask);
- platform_device_put(pdev);
- return ERR_PTR(ret);
- }
-
- return pdev;
- }
-
-int __init mxc_register_device(struct platform_device *pdev, void *data)
-{
- int ret;
-
- pdev->dev.platform_data = data;
-
- ret = platform_device_register(pdev);
- if (ret)
- pr_debug("Unable to register platform device '%s': %d\n",
- pdev->name, ret);
-
- return ret;
-}
-
struct device mxc_aips_bus = {
.init_name = "mxc_aips",
.parent = &platform_bus,
^ permalink raw reply
* linux-next: build failure after merge of the iommu tree
From: Stephen Rothwell @ 2011-08-29 3:32 UTC (permalink / raw)
To: Joerg Roedel; +Cc: linux-next, linux-kernel, Ohad Ben-Cohen
[-- Attachment #1: Type: text/plain, Size: 566 bytes --]
Hi Joerg,
After merging the iommu tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/iommu/omap-iommu.c:27:24: fatal error: plat/iommu.h: No such file or directory
Caused by commit fcf3a6ef4a58 ("omap: iommu/iovmm: move to dedicated
iommu folder"). Presumably building of this code should be restricted to
just some platforms only.
I have dropped the iommu tree for today (since I have no older working
version).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* Re: [Patch] numa: introduce CONFIG_NUMA_SYSFS for drivers/base/node.c
From: Cong Wang @ 2011-08-29 2:29 UTC (permalink / raw)
To: David Rientjes
Cc: Randy Dunlap, Andrew Morton, Stephen Rothwell, gregkh, linux-next,
LKML, linux-mm
In-Reply-To: <alpine.DEB.2.00.1108251356220.18747@chino.kir.corp.google.com>
于 2011年08月26日 04:57, David Rientjes 写道:
> On Thu, 25 Aug 2011, Cong Wang wrote:
>
>>> No, it doesn't work, CONFIG_HUGETLBFS can be enabled with CONFIG_NUMA=y
>>> and CONFIG_SYSFS=n and that uses data structures from drivers/base/node.c
>>> which doesn't get compiled with this patch.
>>
>> So, you mean with CONFIG_NUMA=y&& CONFIG_SYSFS=n&& CONFIG_HUGETLBFS=y
>> we still get compile error?
>>
>> Which data structures are used by hugetlbfs?
>>
>
> node_states[], which is revealed at link time if you tried to compile your
> patch. It's obvious that we don't want to add per-node hugetlbfs
> attributes to sysfs directories if sysfs is disabled, so you need to
> modify the hugetlbfs code as well.
Makes sense. Thanks!
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
^ permalink raw reply
* linux-next: build failure after merge of the scsi tree
From: Stephen Rothwell @ 2011-08-29 2:09 UTC (permalink / raw)
To: James Bottomley; +Cc: linux-next, linux-kernel, Giridhar Malavali, Chad Dupuis
[-- Attachment #1: Type: text/plain, Size: 887 bytes --]
Hi James,
After merging the scsi tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:
drivers/scsi/qla2xxx/qla_nx.c: In function 'qla82xx_md_alloc':
drivers/scsi/qla2xxx/qla_nx.c:4815:2: error: implicit declaration of function 'vmalloc'
drivers/scsi/qla2xxx/qla_nx.c:4815:14: warning: assignment makes pointer from integer without a cast
drivers/scsi/qla2xxx/qla_nx.c: In function 'qla82xx_md_free':
drivers/scsi/qla2xxx/qla_nx.c:4845:3: error: implicit declaration of function 'vfree'
Caused by commit b60bb5832c00 ("[SCSI] qla2xxx: Add support for ISP82xx
to capture dump (minidump) on failure"). Missing include of
linux/vmalloc.h. See Rule 1 in Documentation/SubmitChecklist.
I have used the scsi tree from next-20110826 for today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* linux-next: manual merge of the arm-soc tree with the arm tree
From: Stephen Rothwell @ 2011-08-29 1:04 UTC (permalink / raw)
To: Arnd Bergmann
Cc: linux-next, linux-kernel, Sascha Hauer, Russell King,
Linus Walleij
Hi Arnd,
Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-u300/Makefile.boot between commit 74b84ad6c1a5 ("ARM:
7022/1: allow to detect conflicting zreladdrs") from the arm tree and
commit 732851465445 ("mach-u300: retire odd singlemem variant") from the
arm-soc 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-u300/Makefile.boot
index 69357af,a06bb0d..0000000
--- a/arch/arm/mach-u300/Makefile.boot
+++ b/arch/arm/mach-u300/Makefile.boot
@@@ -1,15 -1,4 +1,4 @@@
- # Note: the following conditions must always be true:
- # ZRELADDR == virt_to_phys(TEXTADDR)
- # PARAMS_PHYS must be within 4MB of ZRELADDR
- # INITRD_PHYS must be in RAM
-
- ifdef CONFIG_MACH_U300_SINGLE_RAM
- zreladdr-y += 0x28E08000
- params_phys-y := 0x28E00100
- else
- zreladdr-y += 0x48008000
- params_phys-y := 0x48000100
- endif
-
- zreladdr-y := 0x48008000
++ zreladdr-y += 0x48008000
+ params_phys-y := 0x48000100
# This isn't used.
- #initrd_phys-y := 0x29800000
+ #initrd_phys-y := 0x48800000
^ permalink raw reply
* linux-next: build failure in Linus' tree
From: Stephen Rothwell @ 2011-08-29 0:44 UTC (permalink / raw)
To: Linus
Cc: linux-next, linux-kernel, NeilBrown, linuxppc-dev, linux-parisc,
J. Bruce Fields
Hi Linus,
After merging the fixes tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:
arch/powerpc/kernel/built-in.o: In function `.sys_call_table':
(.text+0xbd00): undefined reference to `.sys_nfsservctl'
arch/powerpc/kernel/built-in.o: In function `.sys_call_table':
(.text+0xbd08): undefined reference to `.compat_sys_nfsservctl'
Caused by commit f5b940997397 ("All Arch: remove linkage for
sys_nfsservctl system call") which also missed parisc.
I will apply this patch for today:
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 29 Aug 2011 10:38:57 +1000
Subject: [PATCH] remove remaining references to nfsservctl
These were missed in commit f5b940997397 "All Arch: remove linkage
for sys_nfsservctl system call" due to them having no sys_ prefix
(presumably).
Cc: NeilBrown <neilb@suse.de>
Cc: linuxppc-dev@lists.ozlabs.org
Cc: linux-parisc@vger.kernel.org
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
arch/parisc/kernel/syscall_table.S | 2 +-
arch/powerpc/include/asm/systbl.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/parisc/kernel/syscall_table.S b/arch/parisc/kernel/syscall_table.S
index e66366f..3735abd 100644
--- a/arch/parisc/kernel/syscall_table.S
+++ b/arch/parisc/kernel/syscall_table.S
@@ -259,7 +259,7 @@
ENTRY_SAME(ni_syscall) /* query_module */
ENTRY_SAME(poll)
/* structs contain pointers and an in_addr... */
- ENTRY_COMP(nfsservctl)
+ ENTRY_SAME(ni_syscall) /* was nfsservctl */
ENTRY_SAME(setresgid) /* 170 */
ENTRY_SAME(getresgid)
ENTRY_SAME(prctl)
diff --git a/arch/powerpc/include/asm/systbl.h b/arch/powerpc/include/asm/systbl.h
index f6736b7..fa0d27a 100644
--- a/arch/powerpc/include/asm/systbl.h
+++ b/arch/powerpc/include/asm/systbl.h
@@ -171,7 +171,7 @@ SYSCALL_SPU(setresuid)
SYSCALL_SPU(getresuid)
SYSCALL(ni_syscall)
SYSCALL_SPU(poll)
-COMPAT_SYS(nfsservctl)
+SYSCALL(ni_syscall)
SYSCALL_SPU(setresgid)
SYSCALL_SPU(getresgid)
COMPAT_SYS_SPU(prctl)
--
1.7.5.4
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
^ permalink raw reply related
* Re: linux-next tree addition request (fbdev)
From: Stephen Rothwell @ 2011-08-28 16:19 UTC (permalink / raw)
To: Florian Tobias Schandinat
Cc: linux-next, linux-fbdev@vger.kernel.org, Paul Mundt
In-Reply-To: <20110825003353.e930fc7a664dd99c953b555c@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1206 bytes --]
Hi Florian,
On Thu, 25 Aug 2011 00:33:53 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> On Wed, 24 Aug 2011 13:40:46 +0000 Florian Tobias Schandinat <FlorianSchandinat@gmx.de> wrote:
> >
> > can you please add
> >
> > git://github.com/schandinat/linux-2.6.git fbdev-next
> >
> > to linux-next. It collects patches for the frame buffer subsystem.
> > Can you please add the linux-fbdev@vger.kernel.org mailing list as additional
> > contact for warnings/errors/problems?
> >
> > You probably want to drop Paul's fbdev branches as they contain some outdated
> > patches that will conflict with the newer versions.
>
> OK, Paul is still listed as the frame buffer subsystem maintainer, so I
> will need an Ack from him. When I get that, I will replace his tree with
> yours. I assume someone will update the MAINTAINERS file.
>
> I also have another tree from Paul (called fbdev-current) that contained
> fixes for Linus' current release. I also assume that that tree will be
> dropped (unless you have a new version of that as well).
Ping? Anyone?
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* Re: iommu-tree for linux-next
From: Stephen Rothwell @ 2011-08-28 16:06 UTC (permalink / raw)
To: Joerg Roedel; +Cc: linux-next, LKML, David Woodhouse, iommu
In-Reply-To: <20110826114937.GE8978@8bytes.org>
[-- Attachment #1: Type: text/plain, Size: 2041 bytes --]
Hi Joerg,
On Fri, 26 Aug 2011 13:49:37 +0200 Joerg Roedel <joro@8bytes.org> wrote:
>
> I would like to ask if you can include the iommu-tree into linux-next
> for broader testing? The tree can be pulled from
>
> git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git next
>
> The tree currently contains iommu changes for dma-debug and omap-iommu.
> It will also contain changes to x86 iommu code in the near future.
I will add this from Monday unless there are objections.
Thanks for adding your subsystem tree as a participant of linux-next. As
you may know, this is not a judgment of your code. The purpose of
linux-next is for integration testing and to lower the impact of
conflicts between subsystems in the next merge window.
You will need to ensure that the patches/commits in your tree/series have
been:
* submitted under GPL v2 (or later) and include the Contributor's
Signed-off-by,
* posted to the relevant mailing list,
* reviewed by you (or another maintainer of your subsystem tree),
* successfully unit tested, and
* destined for the current or next Linux merge window.
Basically, this should be just what you would send to Linus (or ask him
to fetch). It is allowed to be rebased if you deem it necessary.
--
Cheers,
Stephen Rothwell
sfr@canb.auug.org.au
Legal Stuff:
By participating in linux-next, your subsystem tree contributions are
public and will be included in the linux-next trees. You may be sent
e-mail messages indicating errors or other issues when the
patches/commits from your subsystem tree are merged and tested in
linux-next. These messages may also be cross-posted to the linux-next
mailing list, the linux-kernel mailing list, etc. The linux-next tree
project and IBM (my employer) make no warranties regarding the linux-next
project, the testing procedures, the results, the e-mails, etc. If you
don't agree to these ground rules, let me know and I'll remove your tree
from participation in linux-next.
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* Re: linux-next: Tree for Aug 22 (evm)
From: Arnaud Lacombe @ 2011-08-27 6:06 UTC (permalink / raw)
To: Randy Dunlap
Cc: Mimi Zohar, Stephen Rothwell, Mimi Zohar, linux-next, LKML,
linux-kbuild
In-Reply-To: <20110826100011.9213d872.rdunlap@xenotime.net>
Hi,
On Fri, Aug 26, 2011 at 1:00 PM, Randy Dunlap <rdunlap@xenotime.net> wrote:
> On Fri, 26 Aug 2011 08:39:02 -0400 Mimi Zohar wrote:
>
>> On Tue, 2011-08-23 at 22:10 -0400, Arnaud Lacombe wrote:
>> > Hi,
>> >
>> > On Tue, Aug 23, 2011 at 7:40 PM, Randy Dunlap <rdunlap@xenotime.net> wrote:
>> > > I think that you are going to need to do something like Arnaud suggested
>> > > and use "depends on TCG_TPM=y" instead of just "depends on TCG_TPM",
>> > > unless you can convince someone that this is a kconfig bug.
>> > >
>> > dammit... I guess there is...
>> >
>> > If you consider the following Kconfig:
>> >
>> > config MOD
>> > bool
>> > default y
>> > option modules
>> >
>> > config EXPERIMENTAL
>> > bool
>> > default y
>> >
>> > menuconfig A
>> > tristate "A"
>> > depends on EXPERIMENTAL
>> >
>> > config B
>> > bool "B"
>> >
>> > config B0
>> > bool
>> >
>> > config C
>> > tristate "C"
>> > depends on B
>> >
>> > config C0
>> > tristate
>> >
>> > config D
>> > boolean "D"
>> > depends on A && B
>> > select C
>> > select C0
>> >
>> > config E
>> > tristate "E"
>> >
>> > config F
>> > tristate "F"
>> > select E
>> >
>> > B (KEYS) allows to set C (TRUSTED_KEYS). Also, B (KEYS) and A
>> > (TCG_TPM) allows to set D (EVM), which will select (C). Now,
>> > menuconfig highlight the problem very well. Proceeding as following
>> > A=m, B=y, C=m, E=y, F=y, we ends up having:
>> >
>> > <M> A --->
>> > [*] B
>> > {M} C
>> > [*] D
>> > -*- E
>> > <*> F
>> >
>> > which translate in the following config:
>> >
>> > CONFIG_MOD=y
>> > CONFIG_EXPERIMENTAL=y
>> > CONFIG_A=m
>> > CONFIG_B=y
>> > CONFIG_C=m
>> > CONFIG_C0=m
>> > CONFIG_D=y
>> > CONFIG_E=y
>> > CONFIG_F=y
>> >
>> > I would have expected CONFIG_C and CONFIG_C0 to be 'y', just as 'E'.
>> > If you remove D's dependency on 'A', everything works as expected. So
>> > it would seem direct dependency state influence the state of reverse
>> > dependencies...
>> >
>> > Will have a look...
>> >
>> > - Arnaud
>>
>> Thanks for looking into this! Instead of changing 'TCG_TPM' to
>> 'TCG_TPM=y', the dependency should be on 'TRUSTED_KEYS=y'. Then when
>> I've refactored ENCRYPTED_KEYS, removing the ENCRYPTED_KEYS dependency
>> on TRUSTED_KEYS, the EVM dependency would be '(TRUSTED_KEYS=y ||
>> TRUSTED_KEYS=n)'. Do you want a temporary fix for now?
>
> Yes, linux-next (randconfig) builds are still failing, so we need something
> to prevent that.
>
you may want to try:
git://github.com/lacombar/linux-2.6.git master/kconfig/expr-woes
only the last commit is relevant to the problem, but depend on one
another to get <assert.h>. The rest aims at tidying the expr stuff.
I'm looking for regression it may have introduced.
Thanks,
- Arnaud
ps: I'll most likely be AFK until sunday evening (to be conservative).
> thanks,
> ---
> ~Randy
> *** Remember to use Documentation/SubmitChecklist when testing your code ***
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply
* [PATCH -next] staging: fix rts5139 depends & build
From: Randy Dunlap @ 2011-08-26 18:06 UTC (permalink / raw)
To: Stephen Rothwell, Edwin Rong, gregkh, akpm; +Cc: linux-next, LKML, driverdevel
In-Reply-To: <20110826150000.302334d0b86c17cd9b89b590@canb.auug.org.au>
From: Randy Dunlap <rdunlap@xenotime.net>
RTS5139 should depend on USB, not USB_SUPPORT, to fix build
errors.
USB_SUPPORT can be enabled for gadget-only support
or when PCI is not enabled.
ERROR: "usb_reset_endpoint" [drivers/staging/rts5139/rts5139.ko] undefined!
ERROR: "usb_kill_urb" [drivers/staging/rts5139/rts5139.ko] undefined!
ERROR: "usb_deregister_dev" [drivers/staging/rts5139/rts5139.ko] undefined!
ERROR: "usb_unlink_urb" [drivers/staging/rts5139/rts5139.ko] undefined!
ERROR: "usb_deregister" [drivers/staging/rts5139/rts5139.ko] undefined!
ERROR: "usb_register_dev" [drivers/staging/rts5139/rts5139.ko] undefined!
ERROR: "usb_free_coherent" [drivers/staging/rts5139/rts5139.ko] undefined!
ERROR: "usb_submit_urb" [drivers/staging/rts5139/rts5139.ko] undefined!
ERROR: "usb_sg_cancel" [drivers/staging/rts5139/rts5139.ko] undefined!
ERROR: "usb_find_interface" [drivers/staging/rts5139/rts5139.ko] undefined!
ERROR: "usb_sg_init" [drivers/staging/rts5139/rts5139.ko] undefined!
ERROR: "usb_register_driver" [drivers/staging/rts5139/rts5139.ko] undefined!
ERROR: "usb_alloc_coherent" [drivers/staging/rts5139/rts5139.ko] undefined!
ERROR: "usb_free_urb" [drivers/staging/rts5139/rts5139.ko] undefined!
ERROR: "usb_alloc_urb" [drivers/staging/rts5139/rts5139.ko] undefined!
Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Cc: Edwin Rong <edwin_rong@realsil.com.cn>
---
drivers/staging/rts5139/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- linux-next-20110826.orig/drivers/staging/rts5139/Kconfig
+++ linux-next-20110826/drivers/staging/rts5139/Kconfig
@@ -1,6 +1,6 @@
config RTS5139
tristate "Realtek RTS5139 USB card reader support"
- depends on USB_SUPPORT && SCSI
+ depends on USB && SCSI
help
Say Y here to include driver code to support the Realtek
RTS5139 USB card readers.
^ 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