* linux-next: Tree for December 18
@ 2008-12-18 12:06 Stephen Rothwell
2008-12-18 17:21 ` linux-next: Tree for December 18 (slow-work) Randy Dunlap
` (3 more replies)
0 siblings, 4 replies; 13+ messages in thread
From: Stephen Rothwell @ 2008-12-18 12:06 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 8897 bytes --]
Hi all,
Changes since 20081217:
New tree:
fscache
Undropped tree:
nommu
boot-params
Dropped trees (temporarily):
scsi (build problem)
mtd (build problems)
kvm (build problem)
rr (quilt series import problem)
semaphore-removal (due to unfixed conflicts against Linus' tree)
cpu_alloc (build problem)
perfmon3 (concerns from the x86 team)
audit (difficult conflicts)
The sound tree lost its conflict and merge fixup patch.
The watchdog tree lost its conflict.
The boot-params tree gained a conflict against the sh tree but lost its
build problems.
The kvm tree gained a build problem and was dropped.
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/sfr/linux-next.git
(patches at
http://www.kernel.org/pub/linux/kernel/people/sfr/linux-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,
44x_defconfig and allyesconfig (minus CONFIG_PROFILE_ALL_BRANCHES) and
i386, sparc and sparc64 defconfig.
Below is a summary of the state of the merge.
We are up to 134 trees (counting Linus' and 15 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 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/usb.current
Merging cpufreq-current/fixes
Merging input-current/for-linus
Merging md-current/for-2.6.26
Merging audit-current/for-linus
Merging dwmw2/master
Merging arm/devel
Merging avr32/avr32-arch
Merging blackfin/for-linus
Merging cris/for-next
Merging ia64/test
Merging m68k/for-next
Merging m68knommu/for-next
Merging mips/mips-for-linux-next
Merging parisc/master
Merging powerpc/next
Merging 4xx/next
Merging galak/next
Merging pxa/for-next
Merging s390/features
CONFLICT (content): Merge conflict in drivers/char/Makefile
Merging sh/master
Merging sparc/master
Merging x86/auto-x86-next
Merging xtensa/master
Merging quilt/driver-core
CONFLICT (content): Merge conflict in arch/powerpc/platforms/85xx/mpc85xx_mds.c
Merging quilt/usb
Merging tip-core/auto-core-next
Merging cpus4096/auto-cpus4096-next
CONFLICT (content): Merge conflict in scripts/recordmcount.pl
Merging ftrace/auto-ftrace-next
Merging genirq/auto-genirq-next
Merging safe-poison-pointers/auto-safe-poison-pointers-next
Merging sched/auto-sched-next
Merging stackprotector/auto-stackprotector-next
Merging timers/auto-timers-next
Merging pci/linux-next
Merging quilt/device-mapper
CONFLICT (content): Merge conflict in drivers/md/dm.c
Merging hid/for-next
Merging quilt/i2c
Merging quilt/jdelvare-hwmon
Merging quilt/kernel-doc
Merging v4l-dvb/master
Merging jfs/next
Merging kbuild/master
Merging quilt/ide
Merging libata/NEXT
Merging nfs/linux-next
Merging xfs/master
CONFLICT (content): Merge conflict in fs/xfs/xfs_rename.c
Merging infiniband/for-next
Merging acpi/test
Merging nfsd/nfsd-next
Merging ieee1394/for-next
Merging ubi/linux-next
Merging kvm/master
CONFLICT (content): Merge conflict in arch/x86/kernel/reboot.c
Merging dlm/next
Merging ocfs2/linux-next
Merging ext4/next
Merging async_tx/next
Merging udf/for_next
Merging net/master
CONFLICT (delete/modify): arch/sparc64/kernel/idprom.c deleted in HEAD and modified in net/master. Version net/master of arch/sparc64/kernel/idprom.c left in tree.
CONFLICT (content): Merge conflict in fs/lockd/host.c
CONFLICT (content): Merge conflict in fs/lockd/mon.c
$ git rm -f arch/sparc64/kernel/idprom.c
Applying: net: async_tx merge fix
Merging wireless/master
Merging crypto/master
Merging vfs/for-next
Merging sound/for-next
Merging cpufreq/next
Merging v9fs/for-next
Merging rr_cpumask/master
CONFLICT (content): Merge conflict in arch/x86/kernel/io_apic.c
CONFLICT (content): Merge conflict in kernel/sched.c
CONFLICT (content): Merge conflict in kernel/sched_stats.h
Merging cifs/master
CONFLICT (content): Merge conflict in fs/cifs/connect.c
Applying: cifs: update for new IP4/6 address printing
Merging mmc/next
Merging gfs2/master
Merging input/next
Merging semaphore/semaphore
Merging bkl-removal/bkl-removal
CONFLICT (content): Merge conflict in fs/ioctl.c
Merging ubifs/linux-next
Merging lsm/for-next
Merging block/for-next
CONFLICT (content): Merge conflict in fs/bio.c
Merging embedded/master
Merging firmware/master
CONFLICT (content): Merge conflict in drivers/net/tg3.c
CONFLICT (content): Merge conflict in firmware/Makefile
CONFLICT (content): Merge conflict in firmware/WHENCE
Merging pcmcia/master
Merging battery/master
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 kmemcheck/auto-kmemcheck-next
CONFLICT (content): Merge conflict in MAINTAINERS
CONFLICT (content): Merge conflict in arch/x86/mm/Makefile
CONFLICT (content): Merge conflict in mm/slab.c
CONFLICT (content): Merge conflict in mm/slub.c
Merging generic-ipi/auto-generic-ipi-next
Merging mfd/for-next
Merging hdlc/hdlc-next
Merging drm/drm-next
Merging voltage/for-next
Merging security-testing/next
CONFLICT (content): Merge conflict in drivers/char/tty_audit.c
CONFLICT (content): Merge conflict in fs/cifs/cifs_fs_sb.h
CONFLICT (content): Merge conflict in fs/ocfs2/namei.c
CONFLICT (content): Merge conflict in fs/xfs/linux-2.6/xfs_cred.h
CONFLICT (content): Merge conflict in fs/xfs/linux-2.6/xfs_globals.h
CONFLICT (content): Merge conflict in fs/xfs/linux-2.6/xfs_ioctl.c
CONFLICT (content): Merge conflict in fs/xfs/xfs_vnodeops.h
Merging lblnet/master
CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt
Merging quilt/ttydev
CONFLICT (content): Merge conflict in fs/devpts/inode.c
Merging agp/agp-next
Merging oprofile/auto-oprofile-next
Merging fastboot/auto-fastboot-next
Merging sparseirq/auto-sparseirq-next
Merging iommu/auto-iommu-next
Merging uwb/for-upstream
Merging watchdog/master
Merging proc/proc
Merging bdev/master
Merging dwmw2-iommu/master
Merging cputime/cputime
CONFLICT (content): Merge conflict in kernel/sched.c
Merging osd/linux-next
Merging fatfs/master
Merging fuse/for-next
Merging jc_docs/docs-next
Merging nommu/master
CONFLICT (content): Merge conflict in Documentation/sysctl/vm.txt
CONFLICT (content): Merge conflict in kernel/fork.c
Merging boot-params/master
CONFLICT (content): Merge conflict in arch/arm/kernel/setup.c
CONFLICT (content): Merge conflict in arch/parisc/kernel/setup.c
CONFLICT (content): Merge conflict in arch/sh/boards/mach-microdev/setup.c
CONFLICT (content): Merge conflict in arch/sh/boards/mach-migor/setup.c
CONFLICT (content): Merge conflict in init/main.c
Merging trivial/for-next
Merging quilt/staging
CONFLICT (delete/modify): drivers/staging/winbond/linux/wbusb.c deleted in quilt/staging and modified in HEAD. Version HEAD of drivers/staging/winbond/linux/wbusb.c left in tree.
CONFLICT (content): Merge conflict in drivers/staging/wlan-ng/p80211netdev.c
CONFLICT (content): Merge conflict in drivers/staging/wlan-ng/p80211wext.c
$ git rm -f drivers/staging/winbond/linux/wbusb.c
Merging scsi-post-merge/master
Merging fscache/master
Created commit b19a7ac: Revert "Merge commit 'kvm/master'"
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: linux-next: Tree for December 18 (slow-work)
2008-12-18 12:06 linux-next: Tree for December 18 Stephen Rothwell
@ 2008-12-18 17:21 ` Randy Dunlap
2008-12-18 17:45 ` David Howells
2008-12-18 17:25 ` linux-next: Tree for December 18 (fscache) Randy Dunlap
` (2 subsequent siblings)
3 siblings, 1 reply; 13+ messages in thread
From: Randy Dunlap @ 2008-12-18 17:21 UTC (permalink / raw)
To: Stephen Rothwell, dhowells; +Cc: linux-next, LKML
when CONFIG_SYSCTL=n:
build-r7380.out:/local/linsrc/linux-next-20081218/kernel/slow-work.c:612: error: 'slow_work_max_max_threads' undeclared (first use in this function)
build-r7380.out:make[2]: *** [kernel/slow-work.o] Error 1
---
~Randy
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: linux-next: Tree for December 18 (fscache)
2008-12-18 12:06 linux-next: Tree for December 18 Stephen Rothwell
2008-12-18 17:21 ` linux-next: Tree for December 18 (slow-work) Randy Dunlap
@ 2008-12-18 17:25 ` Randy Dunlap
2008-12-18 17:47 ` David Howells
2008-12-18 23:57 ` linux-next: Tree for December 18 (irq.h documentation) Randy Dunlap
2008-12-19 0:14 ` linux-next: Tree for December 18 (patch: kernel-doc notation) Randy Dunlap
3 siblings, 1 reply; 13+ messages in thread
From: Randy Dunlap @ 2008-12-18 17:25 UTC (permalink / raw)
To: Stephen Rothwell, dhowells; +Cc: linux-next, LKML
On Thu, 18 Dec 2008 23:06:37 +1100 Stephen Rothwell wrote:
> Hi all,
>
> Changes since 20081217:
>
> New tree:
> fscache
When CONFIG_BLOCK=n:
build-r7417.out:/local/linsrc/linux-next-20081218/fs/cachefiles/cf-interface.c:357: error: implicit declaration of function 'fsync_super'
build-r7417.out:make[3]: *** [fs/cachefiles/cf-interface.o] Error 1
Should include/linux/buffer_head.h have an empty stub for fsync_super()
or does fscache even make sense when CONFIG_BLOCK=n?
---
~Randy
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: linux-next: Tree for December 18 (fscache)
2008-12-18 17:25 ` linux-next: Tree for December 18 (fscache) Randy Dunlap
@ 2008-12-18 17:47 ` David Howells
0 siblings, 0 replies; 13+ messages in thread
From: David Howells @ 2008-12-18 17:47 UTC (permalink / raw)
To: Randy Dunlap; +Cc: dhowells, Stephen Rothwell, linux-next, LKML
Randy Dunlap <randy.dunlap@oracle.com> wrote:
> Should include/linux/buffer_head.h have an empty stub for fsync_super()
> or does fscache even make sense when CONFIG_BLOCK=n?
FS-Cache might. CacheFiles probably doesn't.
There've been discussions about a separate caching backend to deal with
non-rotating media such as large chunks of battery-backed RAM or flash.
FS-Cache might make sense in such a situation as these could be accessed in
other ways (such as through MTD or even directly).
I'll make CONFIG_CACHEFILES dependent on CONFIG_BLOCK.
David
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: linux-next: Tree for December 18 (irq.h documentation)
2008-12-18 12:06 linux-next: Tree for December 18 Stephen Rothwell
2008-12-18 17:21 ` linux-next: Tree for December 18 (slow-work) Randy Dunlap
2008-12-18 17:25 ` linux-next: Tree for December 18 (fscache) Randy Dunlap
@ 2008-12-18 23:57 ` Randy Dunlap
2008-12-19 0:33 ` Yinghai Lu
2008-12-19 0:14 ` linux-next: Tree for December 18 (patch: kernel-doc notation) Randy Dunlap
3 siblings, 1 reply; 13+ messages in thread
From: Randy Dunlap @ 2008-12-18 23:57 UTC (permalink / raw)
To: Stephen Rothwell, Yinghai Lu; +Cc: linux-next, LKML, Ingo Molnar
Hi YH,
Whenever you update a struct in a header file that uses kernel-doc,
like struct irq_desc in include/linux/irq.h, please also update the
corresponding kernel-doc notation for the new struct members, so
that kernel-doc warnings are not caused:
from linux-next-20081218:
Warning(linux-next-20081218//include/linux/irq.h:192): No description found for parameter 'timer_rand_state'
Warning(linux-next-20081218//include/linux/irq.h:192): No description found for parameter 'kstat_irqs'
Warning(linux-next-20081218//include/linux/irq.h:192): No description found for parameter 'irq_2_iommu'
Please add kernel-doc notation for those missing struct members.
Thanks,
---
~Randy
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: linux-next: Tree for December 18 (irq.h documentation)
2008-12-18 23:57 ` linux-next: Tree for December 18 (irq.h documentation) Randy Dunlap
@ 2008-12-19 0:33 ` Yinghai Lu
2008-12-19 0:45 ` Randy Dunlap
2008-12-19 0:57 ` Yinghai Lu
0 siblings, 2 replies; 13+ messages in thread
From: Yinghai Lu @ 2008-12-19 0:33 UTC (permalink / raw)
To: Randy Dunlap, Ingo Molnar; +Cc: Stephen Rothwell, linux-next, LKML
Randy Dunlap wrote:
> Hi YH,
>
> Whenever you update a struct in a header file that uses kernel-doc,
> like struct irq_desc in include/linux/irq.h, please also update the
> corresponding kernel-doc notation for the new struct members, so
> that kernel-doc warnings are not caused:
>
> from linux-next-20081218:
>
> Warning(linux-next-20081218//include/linux/irq.h:192): No description found for parameter 'timer_rand_state'
> Warning(linux-next-20081218//include/linux/irq.h:192): No description found for parameter 'kstat_irqs'
> Warning(linux-next-20081218//include/linux/irq.h:192): No description found for parameter 'irq_2_iommu'
>
>
please check
[PATCH] sparseirq: add kernel-doc notation for new member in irq_desc
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
diff --git a/include/linux/irq.h b/include/linux/irq.h
index 1beb63a..4675682 100644
--- a/include/linux/irq.h
+++ b/include/linux/irq.h
@@ -135,6 +135,9 @@ struct irq_2_iommu;
/**
* struct irq_desc - interrupt descriptor
* @irq: interrupt number for this descriptor
+ * @timer_rand_state pointer to timer rand state struct
+ * @kstat_irqs irq stats per cpu
+ * @irq_2_iommu iommu with this irq
* @handle_irq: highlevel irq-events handler [if NULL, __do_IRQ()]
* @chip: low level interrupt hardware access
* @msi_desc: MSI descriptor
^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: linux-next: Tree for December 18 (irq.h documentation)
2008-12-19 0:33 ` Yinghai Lu
@ 2008-12-19 0:45 ` Randy Dunlap
2008-12-19 0:57 ` Yinghai Lu
1 sibling, 0 replies; 13+ messages in thread
From: Randy Dunlap @ 2008-12-19 0:45 UTC (permalink / raw)
To: Yinghai Lu; +Cc: Ingo Molnar, Stephen Rothwell, linux-next, LKML
Yinghai Lu wrote:
> Randy Dunlap wrote:
>> Hi YH,
>>
>> Whenever you update a struct in a header file that uses kernel-doc,
>> like struct irq_desc in include/linux/irq.h, please also update the
>> corresponding kernel-doc notation for the new struct members, so
>> that kernel-doc warnings are not caused:
>>
>> from linux-next-20081218:
>>
>> Warning(linux-next-20081218//include/linux/irq.h:192): No description found for parameter 'timer_rand_state'
>> Warning(linux-next-20081218//include/linux/irq.h:192): No description found for parameter 'kstat_irqs'
>> Warning(linux-next-20081218//include/linux/irq.h:192): No description found for parameter 'irq_2_iommu'
>>
>>
> please check
Thanks. Please see below.
> [PATCH] sparseirq: add kernel-doc notation for new member in irq_desc
>
> Signed-off-by: Yinghai Lu <yinghai@kernel.org>
>
> diff --git a/include/linux/irq.h b/include/linux/irq.h
> index 1beb63a..4675682 100644
> --- a/include/linux/irq.h
> +++ b/include/linux/irq.h
> @@ -135,6 +135,9 @@ struct irq_2_iommu;
> /**
> * struct irq_desc - interrupt descriptor
> * @irq: interrupt number for this descriptor
> + * @timer_rand_state pointer to timer rand state struct
> + * @kstat_irqs irq stats per cpu
> + * @irq_2_iommu iommu with this irq
Format is:
* @member: description
I.e., please add a ':' after each member name.
> * @handle_irq: highlevel irq-events handler [if NULL, __do_IRQ()]
> * @chip: low level interrupt hardware access
> * @msi_desc: MSI descriptor
--
~Randy
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: linux-next: Tree for December 18 (irq.h documentation)
2008-12-19 0:33 ` Yinghai Lu
2008-12-19 0:45 ` Randy Dunlap
@ 2008-12-19 0:57 ` Yinghai Lu
2008-12-19 1:00 ` Randy Dunlap
1 sibling, 1 reply; 13+ messages in thread
From: Yinghai Lu @ 2008-12-19 0:57 UTC (permalink / raw)
To: Randy Dunlap, Ingo Molnar; +Cc: Stephen Rothwell, linux-next, LKML
please check
[PATCH] sparseirq: add kernel-doc notation for new member in irq_desc -v2
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
diff --git a/include/linux/irq.h b/include/linux/irq.h
index 1beb63a..5845bdc 100644
--- a/include/linux/irq.h
+++ b/include/linux/irq.h
@@ -135,6 +135,9 @@ struct irq_2_iommu;
/**
* struct irq_desc - interrupt descriptor
* @irq: interrupt number for this descriptor
+ * @timer_rand_state: pointer to timer rand state struct
+ * @kstat_irqs: irq stats per cpu
+ * @irq_2_iommu: iommu with this irq
* @handle_irq: highlevel irq-events handler [if NULL, __do_IRQ()]
* @chip: low level interrupt hardware access
* @msi_desc: MSI descriptor
^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: linux-next: Tree for December 18 (irq.h documentation)
2008-12-19 0:57 ` Yinghai Lu
@ 2008-12-19 1:00 ` Randy Dunlap
0 siblings, 0 replies; 13+ messages in thread
From: Randy Dunlap @ 2008-12-19 1:00 UTC (permalink / raw)
To: Yinghai Lu; +Cc: Ingo Molnar, Stephen Rothwell, linux-next, LKML
Yinghai Lu wrote:
> please check
>
> [PATCH] sparseirq: add kernel-doc notation for new member in irq_desc -v2
>
> Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Thanks.
Acked-by: Randy Dunlap <randy.dunlap@oracle.com>
> diff --git a/include/linux/irq.h b/include/linux/irq.h
> index 1beb63a..5845bdc 100644
> --- a/include/linux/irq.h
> +++ b/include/linux/irq.h
> @@ -135,6 +135,9 @@ struct irq_2_iommu;
> /**
> * struct irq_desc - interrupt descriptor
> * @irq: interrupt number for this descriptor
> + * @timer_rand_state: pointer to timer rand state struct
> + * @kstat_irqs: irq stats per cpu
> + * @irq_2_iommu: iommu with this irq
> * @handle_irq: highlevel irq-events handler [if NULL, __do_IRQ()]
> * @chip: low level interrupt hardware access
> * @msi_desc: MSI descriptor
>
--
~Randy
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: linux-next: Tree for December 18 (patch: kernel-doc notation)
2008-12-18 12:06 linux-next: Tree for December 18 Stephen Rothwell
` (2 preceding siblings ...)
2008-12-18 23:57 ` linux-next: Tree for December 18 (irq.h documentation) Randy Dunlap
@ 2008-12-19 0:14 ` Randy Dunlap
2008-12-19 10:39 ` Dave Chinner
2008-12-22 22:49 ` Andrew Morton
3 siblings, 2 replies; 13+ messages in thread
From: Randy Dunlap @ 2008-12-19 0:14 UTC (permalink / raw)
To: Stephen Rothwell, Dave Chinner; +Cc: linux-next, LKML, akpm
fs/inode.c and mm/filemap.c need kernel-doc fixes.
What tree were these merged into for linux-next?
How do I get these doc fixes merged? (2 patches below)
---
From: Randy Dunlap <randy.dunlap@oracle.com>
Fix fs/inode.c kernel-doc function parameters:
Warning(linux-next-20081218//fs/inode.c:120): No description found for parameter 'sb'
Warning(linux-next-20081218//fs/inode.c:120): No description found for parameter 'inode'
Warning(linux-next-20081218//fs/inode.c:588): No description found for parameter 'sb'
Warning(linux-next-20081218//fs/inode.c:588): No description found for parameter 'inode'
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
cc: Dave Chinner <david@fromorbit.com>
---
fs/inode.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
--- linux-next-20081218.orig/fs/inode.c
+++ linux-next-20081218/fs/inode.c
@@ -110,8 +110,8 @@ static void wake_up_inode(struct inode *
/**
* inode_init_always - perform inode structure intialisation
- * @sb - superblock inode belongs to.
- * @inode - inode to initialise
+ * @sb: superblock inode belongs to
+ * @inode: inode to initialise
*
* These are initializations that need to be done on every inode
* allocation as the fields are not initialised by slab allocation.
@@ -574,8 +574,8 @@ __inode_add_to_lists(struct super_block
/**
* inode_add_to_lists - add a new inode to relevant lists
- * @sb - superblock inode belongs to.
- * @inode - inode to mark in use
+ * @sb: superblock inode belongs to
+ * @inode: inode to mark in use
*
* When an inode is allocated it needs to be accounted for, added to the in use
* list, the owning superblock and the inode hash. This needs to be done under
---
From: Randy Dunlap <randy.dunlap@oracle.com>
Fix mm/filemap.c functions' kernel-doc:
Warning(/local/linsrc/linux-next-20081218//mm/filemap.c:575): No description found for parameter 'page'
Warning(/local/linsrc/linux-next-20081218//mm/filemap.c:575): No description found for parameter 'waiter'
Warning(/local/linsrc/linux-next-20081218//mm/filemap.c:2348): No description found for parameter 'mapping'
Warning(/local/linsrc/linux-next-20081218//mm/filemap.c:2348): No description found for parameter 'index'
Warning(/local/linsrc/linux-next-20081218//mm/filemap.c:2348): No description found for parameter 'source'
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
cc: Dave Chinner <david@fromorbit.com>
---
mm/filemap.c | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
--- linux-next-20081218.orig/mm/filemap.c
+++ linux-next-20081218/mm/filemap.c
@@ -566,8 +566,8 @@ EXPORT_SYMBOL(wait_on_page_bit);
/**
* add_page_wait_queue - Add an arbitrary waiter to a page's wait queue
- * @page - Page defining the wait queue of interest
- * @waiter - Waiter to add to the queue
+ * @page: Page defining the wait queue of interest
+ * @waiter: Waiter to add to the queue
*
* Add an arbitrary @waiter to the wait queue for the nominated @page.
*/
@@ -2328,11 +2328,10 @@ generic_file_buffered_write(struct kiocb
EXPORT_SYMBOL(generic_file_buffered_write);
/**
- * generic_file_buffered_write_one_page - Write a single page of data to an
- * inode
- * @mapping - The address space of the target inode
- * @index - The target page in the target inode to fill
- * @source - The data to write into the target page
+ * generic_file_buffered_write_one_page - Write a single page of data to an inode
+ * @mapping: The address space of the target inode
+ * @index: The target page in the target inode to fill
+ * @source: The data to write into the target page
*
* Write the data from the source page to the page in the nominated address
* space at the @index specified. Note that the file will not be extended if
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: linux-next: Tree for December 18 (patch: kernel-doc notation)
2008-12-19 0:14 ` linux-next: Tree for December 18 (patch: kernel-doc notation) Randy Dunlap
@ 2008-12-19 10:39 ` Dave Chinner
2008-12-22 22:49 ` Andrew Morton
1 sibling, 0 replies; 13+ messages in thread
From: Dave Chinner @ 2008-12-19 10:39 UTC (permalink / raw)
To: Randy Dunlap; +Cc: Stephen Rothwell, linux-next, LKML, akpm
On Thu, Dec 18, 2008 at 04:14:37PM -0800, Randy Dunlap wrote:
> fs/inode.c and mm/filemap.c need kernel-doc fixes.
>
> What tree were these merged into for linux-next?
The fs/inode.c one ended up going through the XFS tree because
of the XFs code dependent on it....
> How do I get these doc fixes merged? (2 patches below)
Perhaps best to go through the VFS tree for fs/inode.c changes.
> ---
>
> From: Randy Dunlap <randy.dunlap@oracle.com>
>
> Fix fs/inode.c kernel-doc function parameters:
>
> Warning(linux-next-20081218//fs/inode.c:120): No description found for parameter 'sb'
> Warning(linux-next-20081218//fs/inode.c:120): No description found for parameter 'inode'
> Warning(linux-next-20081218//fs/inode.c:588): No description found for parameter 'sb'
> Warning(linux-next-20081218//fs/inode.c:588): No description found for parameter 'inode'
>
> Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
> cc: Dave Chinner <david@fromorbit.com>
Looks fine to me.
Reviewed-by: Dave Chinner <david@fromorbit.com>
Cheers,
Dave.
--
Dave Chinner
david@fromorbit.com
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: linux-next: Tree for December 18 (patch: kernel-doc notation)
2008-12-19 0:14 ` linux-next: Tree for December 18 (patch: kernel-doc notation) Randy Dunlap
2008-12-19 10:39 ` Dave Chinner
@ 2008-12-22 22:49 ` Andrew Morton
1 sibling, 0 replies; 13+ messages in thread
From: Andrew Morton @ 2008-12-22 22:49 UTC (permalink / raw)
To: Randy Dunlap; +Cc: sfr, david, linux-next, linux-kernel
On Thu, 18 Dec 2008 16:14:37 -0800
Randy Dunlap <randy.dunlap@oracle.com> wrote:
> fs/inode.c and mm/filemap.c need kernel-doc fixes.
>
> What tree were these merged into for linux-next?
I use git-blame.
> How do I get these doc fixes merged? (2 patches below)
>
> ---
>
> From: Randy Dunlap <randy.dunlap@oracle.com>
>
> Fix fs/inode.c kernel-doc function parameters:
>
> Warning(linux-next-20081218//fs/inode.c:120): No description found for parameter 'sb'
> Warning(linux-next-20081218//fs/inode.c:120): No description found for parameter 'inode'
> Warning(linux-next-20081218//fs/inode.c:588): No description found for parameter 'sb'
> Warning(linux-next-20081218//fs/inode.c:588): No description found for parameter 'inode'
>
>From the XFS tree:
commit 2cb1599f9b2ecdd7a9e59feeee647eb258966839
Author: David Chinner <david@fromorbit.com>
AuthorDate: Thu Oct 30 17:32:23 2008 +1100
Commit: Lachlan McIlroy <lachlan@redback.melbourne.sgi.com>
CommitDate: Thu Oct 30 17:32:23 2008 +1100
Inode: Allow external initialisers
> ---
>
> From: Randy Dunlap <randy.dunlap@oracle.com>
>
> Fix mm/filemap.c functions' kernel-doc:
>
> Warning(/local/linsrc/linux-next-20081218//mm/filemap.c:575): No description found for parameter 'page'
> Warning(/local/linsrc/linux-next-20081218//mm/filemap.c:575): No description found for parameter 'waiter'
> Warning(/local/linsrc/linux-next-20081218//mm/filemap.c:2348): No description found for parameter 'mapping'
> Warning(/local/linsrc/linux-next-20081218//mm/filemap.c:2348): No description found for parameter 'index'
> Warning(/local/linsrc/linux-next-20081218//mm/filemap.c:2348): No description found for parameter 'source'
>
> Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
> cc: Dave Chinner <david@fromorbit.com>
That's no longer in linux-next. I'd guess it was from the fs-cache
patches.
^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2008-12-22 22:50 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-12-18 12:06 linux-next: Tree for December 18 Stephen Rothwell
2008-12-18 17:21 ` linux-next: Tree for December 18 (slow-work) Randy Dunlap
2008-12-18 17:45 ` David Howells
2008-12-18 17:25 ` linux-next: Tree for December 18 (fscache) Randy Dunlap
2008-12-18 17:47 ` David Howells
2008-12-18 23:57 ` linux-next: Tree for December 18 (irq.h documentation) Randy Dunlap
2008-12-19 0:33 ` Yinghai Lu
2008-12-19 0:45 ` Randy Dunlap
2008-12-19 0:57 ` Yinghai Lu
2008-12-19 1:00 ` Randy Dunlap
2008-12-19 0:14 ` linux-next: Tree for December 18 (patch: kernel-doc notation) Randy Dunlap
2008-12-19 10:39 ` Dave Chinner
2008-12-22 22:49 ` Andrew Morton
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).