* linux-next: no release for Sept 22
From: Stephen Rothwell @ 2009-09-22 2:21 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 250 bytes --]
Hi all,
There will be no linux-next again today as I am still a bit under the
weather (which means "ill" not "diving" or "skiing" :-)).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply
* Re: [PATCH v6] RO/NX protection for loadable kernel modules
From: Rusty Russell @ 2009-09-21 23:59 UTC (permalink / raw)
To: Siarhei Liakh
Cc: linux-kernel, linux-security-module, linux-next, Arjan van de Ven,
James Morris, Andrew Morton, Andi Kleen, Thomas Gleixner,
H. Peter Anvin, Ingo Molnar, Stephen Rothwell
In-Reply-To: <817ecb6f0909101950v2fc6dc6u5cbc40cd9a9dde77@mail.gmail.com>
On Fri, 11 Sep 2009 12:20:47 pm Siarhei Liakh wrote:
> +/*
> + * LKM RO/NX protection: protect module's text/ro-data
> + * from modification and any data from execution.
> + */
> +static void set_section_ro_nx(void *base,
> + unsigned long text_size,
> + unsigned long ro_size,
> + unsigned long total_size)
> +{
> +#ifdef CONFIG_X86
This is usually considered a bad idea. Make a new config option,
CONFIG_HAVE_SET_MEMORY_PROTECTION, select it in arch/x86/Kconfig.
Then wrap the entire functions in one #ifdef CONFIG_HAVE_....
and put empty versions in the #else.
Thanks,
Rusty.
^ permalink raw reply
* Re: [PATCH v6] RO/NX protection for loadable kernel modules
From: Dave Jones @ 2009-09-21 21:40 UTC (permalink / raw)
To: Siarhei Liakh
Cc: linux-kernel, linux-security-module, linux-next, Arjan van de Ven,
James Morris, Andrew Morton, Andi Kleen, Thomas Gleixner,
H. Peter Anvin, Ingo Molnar, Rusty Russell, Stephen Rothwell
In-Reply-To: <817ecb6f0909101950v2fc6dc6u5cbc40cd9a9dde77@mail.gmail.com>
On Thu, Sep 10, 2009 at 10:50:47PM -0400, Siarhei Liakh wrote:
> This patch is a logical extension of the protection provided by
> CONFIG_DEBUG_RODATA to LKMs. The protection is provided by splitting
> module_core and module_init into three logical parts each and setting
> appropriate page access permissions for each individual section:
>
> 1. Code: RO+X
> 2. RO data: RO+NX
> 3. RW data: RW+NX
Hi Siarhei,
I tried out this patch on 2.6.31, and got the following trace during bootup..
------------[ cut here ]------------
WARNING: at kernel/trace/ftrace.c:1003 ftrace_bug+0x198/0x27e() (Not tainted)
Hardware name: VGN-Z540N
Modules linked in: output(+)
Pid: 115, comm: modprobe Not tainted 2.6.31-23.fc12.x86_64 #1
Call Trace:
[<ffffffff81064244>] warn_slowpath_common+0x95/0xc3
[<ffffffffa0000193>] ? video_output_register+0x11/0x10a [output]
[<ffffffff81064299>] warn_slowpath_null+0x27/0x3d
[<ffffffff810d4a0e>] ftrace_bug+0x198/0x27e
[<ffffffffa0000193>] ? video_output_register+0x11/0x10a [output]
[<ffffffff810d5c66>] ftrace_convert_nops+0x201/0x2b9
[<ffffffffa0000193>] ? video_output_register+0x11/0x10a [output]
[<ffffffff810d5d6a>] ftrace_module_notify+0x4c/0x7f
[<ffffffff815099c5>] notifier_call_chain+0x72/0xba
[<ffffffff81086db1>] ? __blocking_notifier_call_chain+0x4c/0x8e
[<ffffffff81086dc8>] __blocking_notifier_call_chain+0x63/0x8e
[<ffffffff81086e1a>] blocking_notifier_call_chain+0x27/0x3d
[<ffffffff810a466a>] sys_init_module+0xb7/0x249
[<ffffffff81011f42>] system_call_fastpath+0x16/0x1b
---[ end trace 95b33ebf87286ae6 ]---
ftrace faulted on writing [<ffffffffa0000193>] video_output_register+0x11/0x10a [output]
I guess ftrace is trying to NOP out something in the modules which
are marked read-only ?
Dave
^ permalink raw reply
* linux-next: no release for Sept 21
From: Stephen Rothwell @ 2009-09-21 9:34 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 212 bytes --]
Hi all,
There will be no linux-next today (or probably tomorrow) as I am a bit
under the weather.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply
* Re: linux-next: manual merge of the tty.current tree with the net-current tree
From: Greg KH @ 2009-09-18 17:27 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, Wolfram Sang, Ken Kawasaki,
David S. Miller
In-Reply-To: <20090917021202.GA7757@kroah.com>
On Wed, Sep 16, 2009 at 07:12:02PM -0700, Greg KH wrote:
> On Thu, Sep 17, 2009 at 10:54:42AM +1000, Stephen Rothwell wrote:
> > Hi Greg,
> >
> > Today's linux-next merge of the tty.current tree got a conflict in
> > drivers/serial/serial_cs.c between commit
> > 531afd64d027e3d798c416b2b37b3cfb1de417d9 ("pcnet_cs: add cis of Linksys
> > multifunction pcmcia card") from the net-current tree and commit
> > 5cea4a4e15a918f19d32fd3dc9a5056f333847c3 ("tty: serial/pcmcia: add ID for
> > Advantech card") from the tty.current tree.
> >
> > Just context changes. I fixed it up (see below) and can carry the fix
> > for a while.
>
> Thanks, I'll handle this when I sync back up with Linus's tree tomorrow.
Now fixed up.
thanks,
greg k-h
^ permalink raw reply
* linux-next: Tree for September 18
From: Stephen Rothwell @ 2009-09-18 6:40 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 8059 bytes --]
Hi all,
Please do not add code destined for 2.6.33 into linux-next trees until
(at least) 2.6.32-rc1 is out. This will hopefully give those who have
stuff destined for just after -rc1 a chance.
Changes since 20090917:
We are seeing conflicts move from one tree to another as Linus merges
them.
The input-current tree still has a build failure so I used the version from
next-20090916.
The blackfin tree lost its conflict.
The ext4 tree lost its conflict.
The nfsd tree lost its build failure.
The xfs tree lost its conflict.
The i2c tree lost its conflict.
The rr tree still has a build failure so I used the version from
next-20090908.
----------------------------------------------------------------------------
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 140 trees (counting Linus' and 21 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 Jan Dittmer for adding the linux-next tree to his build tests
at http://l4x.org/k/ , the guys at http://test.kernel.org/ and 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 arm-current/master
Merging m68k-current/for-linus
Merging powerpc-merge/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 kbuild-current/master
Merging quilt/driver-core.current
Merging quilt/tty.current
CONFLICT (content): Merge conflict in drivers/serial/serial_cs.c
Merging quilt/usb.current
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
$ git reset --hard HEAD^
Merging refs/next/20090916/input-current
Merging arm/devel
Merging davinci/for-next
Merging pxa/for-next
Merging thumb-2/thumb-2
Merging avr32/avr32-arch
Merging blackfin/for-linus
Merging cris/for-next
Merging ia64/test
CONFLICT (content): Merge conflict in arch/ia64/kernel/vmlinux.lds.S
Merging m68k/for-next
Merging m68knommu/for-next
CONFLICT (content): Merge conflict in arch/m68k/include/asm/processor.h
Merging microblaze/next
Merging mips/mips-for-linux-next
Merging parisc/next
CONFLICT (content): Merge conflict in arch/parisc/include/asm/thread_info.h
CONFLICT (content): Merge conflict in arch/parisc/kernel/entry.S
CONFLICT (content): Merge conflict in arch/parisc/kernel/signal.c
Merging powerpc/next
Merging 4xx/next
Merging galak/next
Merging s390/features
Merging sh/master
Merging sparc/master
Merging xtensa/master
Merging cifs/master
Merging configfs/linux-next
Merging ecryptfs/next
Merging ext3/for_next
Merging ext4/next
Merging fatfs/master
Merging fuse/for-next
Merging gfs2/master
Merging jfs/next
Merging nfs/linux-next
Merging nfsd/nfsd-next
Merging nilfs2/for-next
Merging ocfs2/linux-next
Merging squashfs/master
Merging udf/for_next
Merging v9fs/for-next
Merging ubifs/linux-next
CONFLICT (content): Merge conflict in fs/ubifs/super.c
Merging xfs/master
Merging vfs/for-next
Merging pci/linux-next
Merging hid/for-next
Merging quilt/i2c
Merging quilt/jdelvare-hwmon
Merging quilt/kernel-doc
Merging v4l-dvb/master
CONFLICT (content): Merge conflict in drivers/media/video/sh_mobile_ceu_camera.c
Merging quota/for_next
Merging kbuild/master
CONFLICT (content): Merge conflict in scripts/extract-ikconfig
Merging kconfig/for-next
Merging ide/master
Merging libata/NEXT
Merging infiniband/for-next
Merging acpi/test
CONFLICT (content): Merge conflict in MAINTAINERS
CONFLICT (content): Merge conflict in drivers/acpi/power.c
CONFLICT (content): Merge conflict in drivers/pci/dmar.c
Merging ieee1394/for-next
Merging ubi/linux-next
Merging kvm/linux-next
Merging dlm/next
Merging scsi/master
Merging async_tx/next
Merging net/master
Merging wireless/master
Merging mtd/master
CONFLICT (content): Merge conflict in drivers/mtd/mtdcore.c
Merging crypto/master
Merging sound/for-next
Merging cpufreq/next
Merging quilt/rr
CONFLICT (content): Merge conflict in kernel/module.c
$ git reset --hard HEAD^
Merging refs/next/20090908/rr
CONFLICT (content): Merge conflict in drivers/net/virtio_net.c
Merging mmc/next
Merging input/next
Merging lsm/for-next
Merging block/for-next
CONFLICT (content): Merge conflict in fs/fs-writeback.c
CONFLICT (content): Merge conflict in mm/page-writeback.c
Merging quilt/device-mapper
Merging embedded/master
Merging firmware/master
Merging pcmcia/master
Merging battery/master
CONFLICT (content): Merge conflict in drivers/power/wm97xx_battery.c
Merging leds/for-mm
Merging backlight/for-mm
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
CONFLICT (content): Merge conflict in firmware/Makefile
Merging voltage/for-next
CONFLICT (content): Merge conflict in drivers/regulator/Kconfig
Merging security-testing/next
Merging lblnet/master
Merging agp/agp-next
Merging uwb/for-upstream
Merging watchdog/master
Merging bdev/master
Merging dwmw2-iommu/master
CONFLICT (content): Merge conflict in drivers/pci/intel-iommu.c
Merging cputime/cputime
Merging osd/linux-next
Merging jc_docs/docs-next
Merging nommu/master
Merging trivial/for-next
Merging audit/for-next
Merging omap/for-next
Merging quilt/aoe
Merging suspend/linux-next
Merging bluetooth/master
Merging fsnotify/for-next
Merging irda/for-next
Merging hwlat/for-linus
Merging drbd/drbd
Merging kmemleak/kmemleak
Merging tip/auto-latest
CONFLICT (content): Merge conflict in arch/x86/kernel/setup.c
Applying: tip: fix merge for cupmask update
Merging oprofile/for-next
Merging percpu/for-next
Merging sfi/sfi-test
CONFLICT (content): Merge conflict in MAINTAINERS
CONFLICT (content): Merge conflict in arch/x86/kernel/setup.c
CONFLICT (content): Merge conflict in init/main.c
Merging asm-generic/next
Merging hwpoison/hwpoison
Merging quilt/driver-core
Merging quilt/tty
Merging quilt/usb
Merging quilt/staging
Merging scsi-post-merge/master
CONFLICT (content): Merge conflict in drivers/scsi/Makefile
CONFLICT (add/add): Merge conflict in drivers/scsi/pmcraid.c
CONFLICT (content): Merge conflict in kernel/sysctl.c
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply
* Re: linux-next: m86k/m68knommu tree build failure
From: Greg Ungerer @ 2009-09-18 6:09 UTC (permalink / raw)
To: Andreas Schwab
Cc: Stephen Rothwell, Geert Uytterhoeven, linux-next, linux-kernel
In-Reply-To: <m363brb4yk.fsf@hase.home>
Hi Andreas,
Andreas Schwab wrote:
> Greg Ungerer <gerg@snapgear.com> writes:
>
>> Hi Stephen,
>>
>> Stephen Rothwell wrote:
>>> Today's linux-next build (m68k defconfig) failed like this:
>>>
>>> kernel/built-in.o: In function `ptrace_resume':
>>> ptrace.c:(.text+0xc5d6): undefined reference to `user_disable_single_step'
>>> ptrace.c:(.text+0xc5fe): undefined reference to `user_enable_single_step'
>>> ptrace.c:(.text+0xc620): undefined reference to `user_disable_single_step'
>>>
>>> Caused by commit 5db612ef70d24be12f6dbf5d06b23bcd6bc2fc05 ("m68knommu:
>>> define arch_has_single_step() and friends"). This commit added
>>> definitions of these functions for m68knommu, but added declarations (and
>>> arch_has_single_step()) in a common header file.
>> Ah, yes, thanks. I'll fix that. I don't regularly build for m68k,
>> so I missed that in my test builds.
>
> An m68k implementation is here
> <http://permalink.gmane.org/gmane.linux.ports.m68k/721>.
Thanks for the pointer. I have something similar I have been
working on for m68knommu. I'll follow up here with the new
patches soon.
Regards
Greg
------------------------------------------------------------------------
Greg Ungerer -- Principal Engineer EMAIL: gerg@snapgear.com
SnapGear Group, McAfee PHONE: +61 7 3435 2888
825 Stanley St, FAX: +61 7 3891 3630
Woolloongabba, QLD, 4102, Australia WEB: http://www.SnapGear.com
^ permalink raw reply
* Re: linux-next: input-current tree build failure
From: Dmitry Torokhov @ 2009-09-18 6:02 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel
In-Reply-To: <20090917111228.800851b0.sfr@canb.auug.org.au>
Hi Stephen,
On Thu, Sep 17, 2009 at 11:12:28AM +1000, Stephen Rothwell wrote:
> Hi Dmitry,
>
> Today's linux-next build (x86_64 allmodconfig) failed like this:
>
> In file included from drivers/input/serio/i8042.c:23:
> include/linux/i8042.h: In function 'i8042_check_port_owner':
> include/linux/i8042.h:58: error: parameter name omitted
> drivers/input/serio/i8042.c: At top level:
> drivers/input/serio/i8042.c:130: error: redefinition of 'i8042_lock_chip'
> include/linux/i8042.h:45: note: previous definition of 'i8042_lock_chip' was here
> drivers/input/serio/i8042.c:136: error: redefinition of 'i8042_unlock_chip'
> include/linux/i8042.h:49: note: previous definition of 'i8042_unlock_chip' was here
> drivers/input/serio/i8042.c:246: error: redefinition of 'i8042_command'
> include/linux/i8042.h:53: note: previous definition of 'i8042_command' was here
> drivers/input/serio/i8042.c:1193: error: redefinition of 'i8042_check_port_owner'
> include/linux/i8042.h:58: note: previous definition of 'i8042_check_port_owner' was here
>
> Caused by commit 1f57f19e6245c5534c3518a8455419461ec06778 ("Input: libps2
> - additional locking for i8042 ports").
>
> Please, if you add code that depends on a CONFIG option, build it with
> and without the options set ...
>
I did ;) ... but not as module, sorry about this, will fix in a moment.
--
Dmitry
^ permalink raw reply
* Re: linux-next: nfsd tree build failure
From: J. Bruce Fields @ 2009-09-17 19:33 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel
In-Reply-To: <20090917171031.128a846b.sfr@canb.auug.org.au>
On Thu, Sep 17, 2009 at 05:10:31PM +1000, Stephen Rothwell wrote:
> Today's linux-next build (sparc64_defconfig) failed like this:
>
> In file included from arch/sparc/kernel/sys_sparc32.c:32:
> include/linux/nfsd/nfsd.h: In function 'nfs4_state_start':
> include/linux/nfsd/nfsd.h:177: error: no return statement in function returning non-void
Thanks for catching this!
> Caused by commit 29ab23cc5d351658d01a4327d55e9106a73fd04f ("nfsd4: allow
> nfs4 state startup to fail"). Please, if you add code that depends on a
> CONFIG option, build with that option enabled and disabled.
And, um, yes, I'll try to do better at that.
> I have applied the following patch for today:
Thanks, applied (with fixed return value).
--b.
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Thu, 17 Sep 2009 17:03:06 +1000
> Subject: [PATCH] nfsd: return success for non NFS4 nfs4_state_start
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> include/linux/nfsd/nfsd.h | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/include/linux/nfsd/nfsd.h b/include/linux/nfsd/nfsd.h
> index 24fdf89..e9ffeb5 100644
> --- a/include/linux/nfsd/nfsd.h
> +++ b/include/linux/nfsd/nfsd.h
> @@ -174,7 +174,7 @@ int nfs4_reset_recoverydir(char *recdir);
> #else
> static inline int nfs4_state_init(void) { return 0; }
> static inline void nfsd4_free_slabs(void) { }
> -static inline int nfs4_state_start(void) { }
> +static inline int nfs4_state_start(void) { return 1; }
> static inline void nfs4_state_shutdown(void) { }
> static inline time_t nfs4_lease_time(void) { return 0; }
> static inline void nfs4_reset_lease(time_t leasetime) { }
> --
> 1.6.3.3
>
>
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
> http://www.canb.auug.org.au/~sfr/
^ permalink raw reply
* Re: linux-next: manual merge of the ext4 tree with Linus tree
From: Stephen Rothwell @ 2009-09-17 13:30 UTC (permalink / raw)
To: Theodore Tso; +Cc: linux-next, linux-kernel, Jens Axboe
In-Reply-To: <20090917132243.GB24438@mit.edu>
[-- Attachment #1: Type: text/plain, Size: 319 bytes --]
Hi Ted,
On Thu, 17 Sep 2009 09:22:43 -0400 Theodore Tso <tytso@mit.edu> wrote:
>
> Thanks, this is in a patch series which I'm preparing to push to
> Linus, so I've fixed it up on my end.
OK, thanks.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply
* Re: linux-next: manual merge of the ext4 tree with Linus tree
From: Theodore Tso @ 2009-09-17 13:22 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Jens Axboe
In-Reply-To: <20090917115653.2e3b6b49.sfr@canb.auug.org.au>
On Thu, Sep 17, 2009 at 11:56:53AM +1000, Stephen Rothwell wrote:
> Hi Theodore,
>
> Today's linux-next merge of the ext4 tree got a conflict in
> include/trace/events/ext4.h between commit
> 1fe06ad89255c211fe100d7f690d10b161398df8 ("writeback: get rid of
> wbc->for_writepages") from Linus tree and commits
> b3107b75b479ff8f0a8aba9cdb38ec13284ce7eb ("ext4: Fix spelling typo in the
> trace format for trace_ext4_da_writepages()") from the ext4 tree.
>
> I fixed it up (see below) and can carry the fix for a while.
Thanks, this is in a patch series which I'm preparing to push to
Linus, so I've fixed it up on my end.
- Ted
^ permalink raw reply
* Re: linux-next: m86k/m68knommu tree build failure
From: Christoph Hellwig @ 2009-09-17 13:12 UTC (permalink / raw)
To: Andreas Schwab
Cc: Greg Ungerer, Stephen Rothwell, Geert Uytterhoeven, linux-next,
linux-kernel
In-Reply-To: <m363brb4yk.fsf@hase.home>
On Thu, Sep 10, 2009 at 10:04:51AM +0200, Andreas Schwab wrote:
> > Ah, yes, thanks. I'll fix that. I don't regularly build for m68k,
> > so I missed that in my test builds.
>
> An m68k implementation is here
> <http://permalink.gmane.org/gmane.linux.ports.m68k/721>.
It would be great if the m68k maintainers could submit it for mainline.
^ permalink raw reply
* Re: linux-next: Tree for September 17
From: Michal Simek @ 2009-09-17 11:07 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, LKML
In-Reply-To: <20090917172243.67a80fe0.sfr@canb.auug.org.au>
Stephen Rothwell wrote:
> Hi all,
>
> Please do not add code destined for 2.6.33 into linux-next trees until
> (at least) 2.6.32-rc1 is out. This will hopefully give those who have
> stuff destined for just after -rc1 a chance.
>
> Changes since 20090916:
>
> Changed trees: blackfin (new tree from new contact)
> ia64 (maintainer back from vacation)
>
> Removed tree: reiserfs-bkl (temporarily, by request)
>
> We are seeing conflicts move from one tree to another as Linus merges
> them.
>
> The tty.current tree gained a conflict against the net-current tree.
>
> The input-current tree gained a build failure so I sued the version from
> next-20090916.
>
> the thumb-2 tree lost its conflict.
>
> The blackfin tree gained a conflict against Linus' tree.
>
> The ia64 tree gained a conflict against Linus' tree.
>
> The microblaze tree lost its conflict.
Yes, because I removed that conficts patches.
Thanks,
Michal
>
> The sh tree lost its conflict.
>
> The ext4 tree gained a conflict against Linus' tree.
>
> The pci tree lost its conflict and merge fix.
>
> The rr tree still has a build failure so I used the version from
> next-20090908.
>
> The driver-core tree lost a conflict and passed 2 others to other trees.
>
> The nfsd tree gained a build failure for which I applied a patch.
>
> ----------------------------------------------------------------------------
>
> 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 140 trees (counting Linus' and 21 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 Jan Dittmer for adding the linux-next tree to his build tests
> at http://l4x.org/k/ , the guys at http://test.kernel.org/ and 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.
>
--
Michal Simek, Ing. (M.Eng)
PetaLogix - Linux Solutions for a Reconfigurable World
w: www.petalogix.com p: +61-7-30090663,+42-0-721842854 f: +61-7-30090663
^ permalink raw reply
* linux-next: Tree for September 17
From: Stephen Rothwell @ 2009-09-17 7:22 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 10133 bytes --]
Hi all,
Please do not add code destined for 2.6.33 into linux-next trees until
(at least) 2.6.32-rc1 is out. This will hopefully give those who have
stuff destined for just after -rc1 a chance.
Changes since 20090916:
Changed trees: blackfin (new tree from new contact)
ia64 (maintainer back from vacation)
Removed tree: reiserfs-bkl (temporarily, by request)
We are seeing conflicts move from one tree to another as Linus merges
them.
The tty.current tree gained a conflict against the net-current tree.
The input-current tree gained a build failure so I sued the version from
next-20090916.
the thumb-2 tree lost its conflict.
The blackfin tree gained a conflict against Linus' tree.
The ia64 tree gained a conflict against Linus' tree.
The microblaze tree lost its conflict.
The sh tree lost its conflict.
The ext4 tree gained a conflict against Linus' tree.
The pci tree lost its conflict and merge fix.
The rr tree still has a build failure so I used the version from
next-20090908.
The driver-core tree lost a conflict and passed 2 others to other trees.
The nfsd tree gained a build failure for which I applied a patch.
----------------------------------------------------------------------------
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 140 trees (counting Linus' and 21 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 Jan Dittmer for adding the linux-next tree to his build tests
at http://l4x.org/k/ , the guys at http://test.kernel.org/ and 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 arm-current/master
Merging m68k-current/for-linus
Merging powerpc-merge/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 kbuild-current/master
Merging quilt/driver-core.current
Merging quilt/tty.current
CONFLICT (content): Merge conflict in drivers/serial/serial_cs.c
Merging quilt/usb.current
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
$ git reset --hard HEAD^
Merging refs/next/20090916/input-current
Merging arm/devel
Merging davinci/for-next
Merging pxa/for-next
Merging thumb-2/thumb-2
Merging avr32/avr32-arch
Merging blackfin/for-linus
CONFLICT (content): Merge conflict in arch/blackfin/mm/sram-alloc.c
Merging cris/for-next
Merging ia64/test
CONFLICT (content): Merge conflict in arch/ia64/kernel/vmlinux.lds.S
Merging m68k/for-next
Merging m68knommu/for-next
Merging microblaze/next
Merging mips/mips-for-linux-next
Merging parisc/next
CONFLICT (content): Merge conflict in arch/parisc/include/asm/thread_info.h
CONFLICT (content): Merge conflict in arch/parisc/kernel/entry.S
CONFLICT (content): Merge conflict in arch/parisc/kernel/signal.c
Merging powerpc/next
Merging 4xx/next
Merging galak/next
Merging s390/features
Merging sh/master
Merging sparc/master
Merging xtensa/master
Merging cifs/master
Merging configfs/linux-next
Merging ecryptfs/next
Merging ext3/for_next
Merging ext4/next
CONFLICT (content): Merge conflict in include/trace/events/ext4.h
Merging fatfs/master
Merging fuse/for-next
Merging gfs2/master
Merging jfs/next
Merging nfs/linux-next
Merging nfsd/nfsd-next
Merging nilfs2/for-next
Merging ocfs2/linux-next
Merging squashfs/master
Merging udf/for_next
Merging v9fs/for-next
Merging ubifs/linux-next
CONFLICT (content): Merge conflict in fs/ubifs/super.c
Merging xfs/master
CONFLICT (content): Merge conflict in fs/xfs/linux-2.6/xfs_lrw.c
Merging vfs/for-next
Merging pci/linux-next
Merging hid/for-next
Merging quilt/i2c
CONFLICT (content): Merge conflict in drivers/base/class.c
Merging quilt/jdelvare-hwmon
Merging quilt/kernel-doc
Merging v4l-dvb/master
CONFLICT (content): Merge conflict in drivers/media/video/sh_mobile_ceu_camera.c
Merging quota/for_next
Merging kbuild/master
CONFLICT (content): Merge conflict in scripts/extract-ikconfig
Merging kconfig/for-next
Merging ide/master
Merging libata/NEXT
Merging infiniband/for-next
Merging acpi/test
CONFLICT (content): Merge conflict in drivers/acpi/power.c
CONFLICT (content): Merge conflict in drivers/pci/dmar.c
Merging ieee1394/for-next
Merging ubi/linux-next
Merging kvm/linux-next
Merging dlm/next
Merging scsi/master
Merging async_tx/next
Merging net/master
Merging wireless/master
Merging mtd/master
CONFLICT (content): Merge conflict in drivers/mtd/mtdcore.c
Merging crypto/master
Merging sound/for-next
Merging cpufreq/next
Merging quilt/rr
CONFLICT (delete/modify): arch/x86/include/asm/es7000/apic.h deleted in HEAD and modified in quilt/rr. Version quilt/rr of arch/x86/include/asm/es7000/apic.h left in tree.
CONFLICT (delete/modify): arch/x86/include/asm/numaq/apic.h deleted in HEAD and modified in quilt/rr. Version quilt/rr of arch/x86/include/asm/numaq/apic.h left in tree.
CONFLICT (content): Merge conflict in drivers/hid/hid-core.c
CONFLICT (content): Merge conflict in drivers/media/video/em28xx/em28xx.h
CONFLICT (content): Merge conflict in drivers/media/video/saa7134/saa7134-core.c
CONFLICT (content): Merge conflict in drivers/media/video/saa7134/saa7134.h
CONFLICT (content): Merge conflict in drivers/net/virtio_net.c
CONFLICT (content): Merge conflict in drivers/virtio/virtio_ring.c
CONFLICT (content): Merge conflict in include/linux/kmod.h
CONFLICT (content): Merge conflict in include/linux/moduleparam.h
CONFLICT (content): Merge conflict in init/main.c
CONFLICT (content): Merge conflict in kernel/cpu.c
CONFLICT (content): Merge conflict in kernel/extable.c
CONFLICT (content): Merge conflict in kernel/kmod.c
CONFLICT (content): Merge conflict in kernel/kthread.c
CONFLICT (content): Merge conflict in kernel/module.c
CONFLICT (content): Merge conflict in kernel/params.c
CONFLICT (content): Merge conflict in kernel/sched_cpupri.c
CONFLICT (delete/modify): mm/pdflush.c deleted in HEAD and modified in quilt/rr. Version quilt/rr of mm/pdflush.c left in tree.
$ git reset --hard HEAD^
Merging refs/next/20090908/rr
CONFLICT (content): Merge conflict in drivers/net/virtio_net.c
Merging mmc/next
Merging input/next
Merging lsm/for-next
Merging block/for-next
CONFLICT (content): Merge conflict in fs/fs-writeback.c
CONFLICT (content): Merge conflict in mm/page-writeback.c
Merging quilt/device-mapper
Merging embedded/master
Merging firmware/master
Merging pcmcia/master
Merging battery/master
CONFLICT (content): Merge conflict in drivers/power/wm97xx_battery.c
Merging leds/for-mm
Merging backlight/for-mm
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
CONFLICT (content): Merge conflict in firmware/Makefile
Merging voltage/for-next
CONFLICT (content): Merge conflict in drivers/regulator/Kconfig
Merging security-testing/next
Merging lblnet/master
Merging agp/agp-next
Merging uwb/for-upstream
Merging watchdog/master
Merging bdev/master
Merging dwmw2-iommu/master
CONFLICT (content): Merge conflict in drivers/pci/intel-iommu.c
Merging cputime/cputime
Merging osd/linux-next
Merging jc_docs/docs-next
Merging nommu/master
Merging trivial/for-next
Merging audit/for-next
Merging omap/for-next
Merging quilt/aoe
Merging suspend/linux-next
Merging bluetooth/master
Merging fsnotify/for-next
Merging irda/for-next
Merging hwlat/for-linus
Merging drbd/drbd
Merging kmemleak/kmemleak
Merging tip/auto-latest
CONFLICT (content): Merge conflict in arch/x86/kernel/setup.c
Applying: tip: fix merge for cupmask update
Merging oprofile/for-next
Merging percpu/for-next
Merging sfi/sfi-test
CONFLICT (content): Merge conflict in arch/x86/kernel/setup.c
CONFLICT (content): Merge conflict in init/main.c
Merging asm-generic/next
Merging hwpoison/hwpoison
Merging quilt/driver-core
Merging quilt/tty
Merging quilt/usb
Merging quilt/staging
Merging scsi-post-merge/master
CONFLICT (content): Merge conflict in drivers/scsi/Makefile
CONFLICT (add/add): Merge conflict in drivers/scsi/pmcraid.c
CONFLICT (content): Merge conflict in kernel/sysctl.c
Applying: nfsd: return success for non NFS4 nfs4_state_start
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply
* linux-next: nfsd tree build failure
From: Stephen Rothwell @ 2009-09-17 7:10 UTC (permalink / raw)
To: J. Bruce Fields; +Cc: linux-next, linux-kernel
Hi Bruce,
Today's linux-next build (sparc64_defconfig) failed like this:
In file included from arch/sparc/kernel/sys_sparc32.c:32:
include/linux/nfsd/nfsd.h: In function 'nfs4_state_start':
include/linux/nfsd/nfsd.h:177: error: no return statement in function returning non-void
Caused by commit 29ab23cc5d351658d01a4327d55e9106a73fd04f ("nfsd4: allow
nfs4 state startup to fail"). Please, if you add code that depends on a
CONFIG option, build with that option enabled and disabled.
I have applied the following patch for today:
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 17 Sep 2009 17:03:06 +1000
Subject: [PATCH] nfsd: return success for non NFS4 nfs4_state_start
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
include/linux/nfsd/nfsd.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/include/linux/nfsd/nfsd.h b/include/linux/nfsd/nfsd.h
index 24fdf89..e9ffeb5 100644
--- a/include/linux/nfsd/nfsd.h
+++ b/include/linux/nfsd/nfsd.h
@@ -174,7 +174,7 @@ int nfs4_reset_recoverydir(char *recdir);
#else
static inline int nfs4_state_init(void) { return 0; }
static inline void nfsd4_free_slabs(void) { }
-static inline int nfs4_state_start(void) { }
+static inline int nfs4_state_start(void) { return 1; }
static inline void nfs4_state_shutdown(void) { }
static inline time_t nfs4_lease_time(void) { return 0; }
static inline void nfs4_reset_lease(time_t leasetime) { }
--
1.6.3.3
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
^ permalink raw reply related
* Re: linux-next: cpufreq-current tree build warning
From: Dave Jones @ 2009-09-17 3:17 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Kurt Roeckx
In-Reply-To: <20090917125556.1125d8ae.sfr@canb.auug.org.au>
On Thu, Sep 17, 2009 at 12:55:56PM +1000, Stephen Rothwell wrote:
> so, no.
> (origin/master is Linus' tree of about 2 hours ago, commit
> ab86e5765d41a5eb4239a1c04d613db87bea5ed8 "Merge
> git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6")
>
> Looking further, this is the cpureq-current tree I am complaining about,
> in the cpufreq tree, you also have:
Oh, from the 'fixes' branch ? Just drop that for now, and only pick up 'next'
(though next pull request went to linus today, so the whole thing should be
gone soon).
Dave
^ permalink raw reply
* Re: linux-next: cpufreq-current tree build warning
From: Stephen Rothwell @ 2009-09-17 2:55 UTC (permalink / raw)
To: Dave Jones; +Cc: linux-next, linux-kernel, Kurt Roeckx
In-Reply-To: <20090917022726.GA30706@redhat.com>
[-- Attachment #1: Type: text/plain, Size: 3476 bytes --]
Hi Dave,
On Wed, 16 Sep 2009 22:27:26 -0400 Dave Jones <davej@redhat.com> wrote:
>
> On Thu, Sep 17, 2009 at 12:06:51PM +1000, Stephen Rothwell wrote:
> >
> > Today's linux-next build (x86_64 allmodconfig) produced this warning:
> >
> > arch/x86/kernel/cpu/cpufreq/powernow-k8.c: In function 'fill_powernow_table_fidvid':
> > arch/x86/kernel/cpu/cpufreq/powernow-k8.c:1001: warning: passing argument 1 of 'invalidate_entry' from incompatible pointer type
> > arch/x86/kernel/cpu/cpufreq/powernow-k8.c:608: note: expected 'struct cpufreq_frequency_table *' but argument is of type 'struct powernow_k8_data *'
> >
> > Introduced by commit 7fc1b26613587ab4369615445b5485040c60fef1 ("[CPUFREQ]
> > Fix NULL ptr regression in powernow-k8").
>
> I'm very confused. I don't see this..
>
> (22:22:25:davej:cpufreq)$ make arch/x86/kernel/cpu/cpufreq/powernow-k8.o
> CHK include/linux/version.h
> CHK include/linux/utsrelease.h
> SYMLINK include/asm -> include/asm-x86
> CALL scripts/checksyscalls.sh
> CC [M] arch/x86/kernel/cpu/cpufreq/powernow-k8.o
> (22:22:30:davej:cpufreq)$
>
> Also, line 1001 is ..
>
> if (data->acpi_data.state_count)
That is line 1022 in my tree.
>From line 986 (in fucntion fill_powernow_table_fidvid):
/* verify only 1 entry from the lo frequency table */
if (fid < HI_FID_TABLE_BOTTOM) {
if (cntlofreq) {
/* if both entries are the same,
* ignore this one ... */
if ((freq != powernow_table[cntlofreq].frequency) ||
(index != powernow_table[cntlofreq].index)) {
printk(KERN_ERR PFX
"Too many lo freq table "
"entries\n");
return 1;
}
dprintk("double low frequency table entry, "
"ignoring it.\n");
invalidate_entry(data, i);
continue;
} else
cntlofreq = i;
}
> So I'm not sure what your gcc is talking about.
This is gcc 4.4.0 if that is relevant.
> Does next contain additional patches to this file from outside the cpufreq.git tree?
$ git log origin/master.. arch/x86/kernel/cpu/cpufreq/powernow-k8.c
commit 7fc1b26613587ab4369615445b5485040c60fef1
Author: Kurt Roeckx <kurt@roeckx.be>
Date: Wed Sep 16 11:09:32 2009 -0400
[CPUFREQ] Fix NULL ptr regression in powernow-k8
Fixes bugzilla #13780
From: Kurt Roeckx <kurt@roeckx.be>
Signed-off-by: Dave Jones <davej@redhat.com>
so, no.
(origin/master is Linus' tree of about 2 hours ago, commit
ab86e5765d41a5eb4239a1c04d613db87bea5ed8 "Merge
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6")
Looking further, this is the cpureq-current tree I am complaining about,
in the cpufreq tree, you also have:
commit db39d5529d347de5e2eec1a72d67fcfacae6c5a2
Author: Mark Langsdorf <mark.langsdorf@amd.com>
Date: Fri Aug 21 19:15:28 2009 -0500
[CPUFREQ] Powernow-k8: Enable more than 2 low P-states
Remove an obsolete check that used to prevent there being more
than 2 low P-states. Now that low-to-low P-states changes are
enabled, it prevents otherwise workable configurations with
multiple low P-states.
Signed-off-by: Mark Langsdorf <mark.langsdorf@amd.com>
Tested-by: Krists Krilovs <pow@pow.za.net>
Signed-off-by: Dave Jones <davej@redhat.com>
Which removes the above code ...
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply
* Re: linux-next: manual merge of the tty.current tree with the net-current tree
From: Stephen Rothwell @ 2009-09-17 2:44 UTC (permalink / raw)
To: Greg KH
Cc: linux-next, linux-kernel, Wolfram Sang, Ken Kawasaki,
David S. Miller
In-Reply-To: <20090917021202.GA7757@kroah.com>
[-- Attachment #1: Type: text/plain, Size: 283 bytes --]
Hi Greg,
On Wed, 16 Sep 2009 19:12:02 -0700 Greg KH <greg@kroah.com> wrote:
>
> Thanks, I'll handle this when I sync back up with Linus's tree tomorrow.
OK, thanks.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply
* Re: linux-next: cpufreq-current tree build warning
From: Dave Jones @ 2009-09-17 2:27 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Kurt Roeckx
In-Reply-To: <20090917120651.f0cdf4c2.sfr@canb.auug.org.au>
On Thu, Sep 17, 2009 at 12:06:51PM +1000, Stephen Rothwell wrote:
> Hi Dave,
>
> Today's linux-next build (x86_64 allmodconfig) produced this warning:
>
> arch/x86/kernel/cpu/cpufreq/powernow-k8.c: In function 'fill_powernow_table_fidvid':
> arch/x86/kernel/cpu/cpufreq/powernow-k8.c:1001: warning: passing argument 1 of 'invalidate_entry' from incompatible pointer type
> arch/x86/kernel/cpu/cpufreq/powernow-k8.c:608: note: expected 'struct cpufreq_frequency_table *' but argument is of type 'struct powernow_k8_data *'
>
> Introduced by commit 7fc1b26613587ab4369615445b5485040c60fef1 ("[CPUFREQ]
> Fix NULL ptr regression in powernow-k8").
Hi Stephen,
I'm very confused. I don't see this..
(22:22:25:davej:cpufreq)$ make arch/x86/kernel/cpu/cpufreq/powernow-k8.o
CHK include/linux/version.h
CHK include/linux/utsrelease.h
SYMLINK include/asm -> include/asm-x86
CALL scripts/checksyscalls.sh
CC [M] arch/x86/kernel/cpu/cpufreq/powernow-k8.o
(22:22:30:davej:cpufreq)$
Also, line 1001 is ..
if (data->acpi_data.state_count)
So I'm not sure what your gcc is talking about.
Does next contain additional patches to this file from outside the cpufreq.git tree?
Dave
^ permalink raw reply
* Re: linux-next: manual merge of the tty.current tree with the net-current tree
From: Greg KH @ 2009-09-17 2:12 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, Wolfram Sang, Ken Kawasaki,
David S. Miller
In-Reply-To: <20090917105442.297b6ea1.sfr@canb.auug.org.au>
On Thu, Sep 17, 2009 at 10:54:42AM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the tty.current tree got a conflict in
> drivers/serial/serial_cs.c between commit
> 531afd64d027e3d798c416b2b37b3cfb1de417d9 ("pcnet_cs: add cis of Linksys
> multifunction pcmcia card") from the net-current tree and commit
> 5cea4a4e15a918f19d32fd3dc9a5056f333847c3 ("tty: serial/pcmcia: add ID for
> Advantech card") from the tty.current tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix
> for a while.
Thanks, I'll handle this when I sync back up with Linus's tree tomorrow.
greg k-h
^ permalink raw reply
* linux-next: cpufreq-current tree build warning
From: Stephen Rothwell @ 2009-09-17 2:06 UTC (permalink / raw)
To: Dave Jones; +Cc: linux-next, linux-kernel, Kurt Roeckx
[-- Attachment #1: Type: text/plain, Size: 678 bytes --]
Hi Dave,
Today's linux-next build (x86_64 allmodconfig) produced this warning:
arch/x86/kernel/cpu/cpufreq/powernow-k8.c: In function 'fill_powernow_table_fidvid':
arch/x86/kernel/cpu/cpufreq/powernow-k8.c:1001: warning: passing argument 1 of 'invalidate_entry' from incompatible pointer type
arch/x86/kernel/cpu/cpufreq/powernow-k8.c:608: note: expected 'struct cpufreq_frequency_table *' but argument is of type 'struct powernow_k8_data *'
Introduced by commit 7fc1b26613587ab4369615445b5485040c60fef1 ("[CPUFREQ]
Fix NULL ptr regression in powernow-k8").
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply
* Re: linux-next: manual merge of the blackfin tree with Linus' tree
From: Stephen Rothwell @ 2009-09-17 2:00 UTC (permalink / raw)
To: Mike Frysinger; +Cc: linux-next, linux-kernel, Tejun Heo
In-Reply-To: <8bd0f97a0909161834j328abe5aq96b7cb69893d1094@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 286 bytes --]
Hi Mike,
On Wed, 16 Sep 2009 21:34:15 -0400 Mike Frysinger <vapier.adi@gmail.com> wrote:
>
> ive pulled down the latest mainline and rebased my branch onto it.
Thanks.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply
* linux-next: manual merge of the ext4 tree with Linus tree
From: Stephen Rothwell @ 2009-09-17 1:56 UTC (permalink / raw)
To: Theodore Tso; +Cc: linux-next, linux-kernel, Jens Axboe
Hi Theodore,
Today's linux-next merge of the ext4 tree got a conflict in
include/trace/events/ext4.h between commit
1fe06ad89255c211fe100d7f690d10b161398df8 ("writeback: get rid of
wbc->for_writepages") from Linus tree and commits
b3107b75b479ff8f0a8aba9cdb38ec13284ce7eb ("ext4: Fix spelling typo in the
trace format for trace_ext4_da_writepages()") from the ext4 tree.
I fixed it up (see below) and can carry the fix for a while.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc include/trace/events/ext4.h
index 8d433c4e,3d26f9d..0000000
--- a/include/trace/events/ext4.h
+++ b/include/trace/events/ext4.h
@@@ -243,14 -247,50 +246,49 @@@ TRACE_EVENT(ext4_da_writepages
__entry->range_cyclic = wbc->range_cyclic;
),
- TP_printk("dev %s ino %lu nr_t_write %ld pages_skipped %ld range_start %llu range_end %llu nonblocking %d for_kupdate %d for_reclaim %d range_cyclic %d",
- jbd2_dev_to_name(__entry->dev), __entry->ino, __entry->nr_to_write,
- TP_printk("dev %s ino %lu nr_to_write %ld pages_skipped %ld range_start %llu range_end %llu nonblocking %d for_kupdate %d for_reclaim %d for_writepages %d range_cyclic %d",
++ TP_printk("dev %s ino %lu nr_to_write %ld pages_skipped %ld range_start %llu range_end %llu nonblocking %d for_kupdate %d for_reclaim %d range_cyclic %d",
+ jbd2_dev_to_name(__entry->dev),
+ (unsigned long) __entry->ino, __entry->nr_to_write,
__entry->pages_skipped, __entry->range_start,
__entry->range_end, __entry->nonblocking,
__entry->for_kupdate, __entry->for_reclaim,
- __entry->for_writepages, __entry->range_cyclic)
+ __entry->range_cyclic)
);
+ TRACE_EVENT(ext4_da_write_pages,
+ TP_PROTO(struct inode *inode, struct mpage_da_data *mpd),
+
+ TP_ARGS(inode, mpd),
+
+ TP_STRUCT__entry(
+ __field( dev_t, dev )
+ __field( ino_t, ino )
+ __field( __u64, b_blocknr )
+ __field( __u32, b_size )
+ __field( __u32, b_state )
+ __field( unsigned long, first_page )
+ __field( int, io_done )
+ __field( int, pages_written )
+ ),
+
+ TP_fast_assign(
+ __entry->dev = inode->i_sb->s_dev;
+ __entry->ino = inode->i_ino;
+ __entry->b_blocknr = mpd->b_blocknr;
+ __entry->b_size = mpd->b_size;
+ __entry->b_state = mpd->b_state;
+ __entry->first_page = mpd->first_page;
+ __entry->io_done = mpd->io_done;
+ __entry->pages_written = mpd->pages_written;
+ ),
+
+ TP_printk("dev %s ino %lu b_blocknr %llu b_size %u b_state 0x%04x first_page %lu io_done %d pages_written %d",
+ jbd2_dev_to_name(__entry->dev), (unsigned long) __entry->ino,
+ __entry->b_blocknr, __entry->b_size,
+ __entry->b_state, __entry->first_page,
+ __entry->io_done, __entry->pages_written)
+ );
+
TRACE_EVENT(ext4_da_writepages_result,
TP_PROTO(struct inode *inode, struct writeback_control *wbc,
int ret, int pages_written),
^ permalink raw reply
* Re: linux-next: manual merge of the blackfin tree with Linus' tree
From: Mike Frysinger @ 2009-09-17 1:34 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Tejun Heo
In-Reply-To: <20090917112604.acbae122.sfr@canb.auug.org.au>
On Wed, Sep 16, 2009 at 21:26, Stephen Rothwell wrote:
> Today's linux-next merge of the blackfin tree got a conflict in
> arch/blackfin/mm/sram-alloc.c between commit
> b9bf3121af348d9255f1c917830fe8c2df52efcb ("percpu: use
> DEFINE_PER_CPU_SHARED_ALIGNED()") from Linus' tree and commit
> 40bf94d6d1158fb6d6d67a666e6b16ab6ac3986e ("Blackfin: push SRAM locks down
> into related ifdefs") from the blackfin tree.
>
> The latter moved the code that the former modified. I fixed it up (see
> below) and can carry the fix for a while.
ive pulled down the latest mainline and rebased my branch onto it.
thanks for the heads up.
-mike
^ permalink raw reply
* linux-next: manual merge of the ia64 tree with Linus' tree
From: Stephen Rothwell @ 2009-09-17 1:33 UTC (permalink / raw)
To: Luck, Tony; +Cc: linux-next, linux-kernel, Tejun Heo, Nelson Elhage
Hi Tony,
Today's linux-next merge of the ia64 tree got a conflict in
arch/ia64/kernel/vmlinux.lds.S between commit
023bf6f1b8bf58dc4da7f0dc1cf4787b0d5297c1 ("linker script: unify usage of
discard definition") from Linus' tree and commit
6ae86350857bf3e862f8dcd10039ccb45e056f85 ("[IA64] Clean up linker script
using standard macros") from the ia64 tree.
I fixed it up (I think - see below) and can carry the fix for a while.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/ia64/kernel/vmlinux.lds.S
index eb4214d,f69f411..0000000
--- a/arch/ia64/kernel/vmlinux.lds.S
+++ b/arch/ia64/kernel/vmlinux.lds.S
@@@ -284,39 -228,8 +228,10 @@@ SECTION
_end = .;
code : { } :code
- /* Stabs debugging sections. */
- .stab 0 : { *(.stab) }
- .stabstr 0 : { *(.stabstr) }
- .stab.excl 0 : { *(.stab.excl) }
- .stab.exclstr 0 : { *(.stab.exclstr) }
- .stab.index 0 : { *(.stab.index) }
- .stab.indexstr 0 : { *(.stab.indexstr) }
- /* DWARF debug sections.
- Symbols in the DWARF debugging sections are relative to the beginning
- of the section so we begin them at 0. */
- /* DWARF 1 */
- .debug 0 : { *(.debug) }
- .line 0 : { *(.line) }
- /* GNU DWARF 1 extensions */
- .debug_srcinfo 0 : { *(.debug_srcinfo) }
- .debug_sfnames 0 : { *(.debug_sfnames) }
- /* DWARF 1.1 and DWARF 2 */
- .debug_aranges 0 : { *(.debug_aranges) }
- .debug_pubnames 0 : { *(.debug_pubnames) }
- /* DWARF 2 */
- .debug_info 0 : { *(.debug_info) }
- .debug_abbrev 0 : { *(.debug_abbrev) }
- .debug_line 0 : { *(.debug_line) }
- .debug_frame 0 : { *(.debug_frame) }
- .debug_str 0 : { *(.debug_str) }
- .debug_loc 0 : { *(.debug_loc) }
- .debug_macinfo 0 : { *(.debug_macinfo) }
- /* SGI/MIPS DWARF 2 extensions */
- .debug_weaknames 0 : { *(.debug_weaknames) }
- .debug_funcnames 0 : { *(.debug_funcnames) }
- .debug_typenames 0 : { *(.debug_typenames) }
- .debug_varnames 0 : { *(.debug_varnames) }
+
+ STABS_DEBUG
+ DWARF_DEBUG
- /DISCARD/ : { *(.note) }
+
+ /* Default discards */
+ DISCARDS
}
^ 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