* linux-next: Tree for November 20
From: Stephen Rothwell @ 2008-11-20 10:29 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 7488 bytes --]
Hi all,
Changes since 20081119:
Undropped trees:
driver-core
usb
staging
Dropped trees (temporarily):
rr (build problem)
proc (build problem)
userns (it depends on creds)
semaphore-removal (due to unfixed conflicts against Linus' tree)
The s390 tree gained a conflict against the powerpc tree.
The sched tree lost its conflict.
The net tree lost its 2 conflicts but gained another conflict against the
wireless-current tree and required two fixes to the merge.
The wireless tree gained a conflict against the wireless-current tree.
The rr tree gained a conflict against the s390 tree and also a build
failure that caused me to drop the tree.
The block tree lost its conflict.
The security-testing tree gained a conflict against the ocfs2 tree.
The proc tree gained 2 conflicts against the security-testing tree and a
build failure that caused me to drop the tree.
----------------------------------------------------------------------------
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 and i386, sparc and sparc64 defconfig.
Below is a summary of the state of the merge.
We are up to 126 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 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/Kconfig
CONFLICT (content): Merge conflict in drivers/char/Makefile
CONFLICT (content): Merge conflict in include/linux/kernel.h
Merging sh/master
Merging sparc/master
Merging x86/auto-x86-next
Merging xtensa/master
Merging quilt/driver-core
Merging quilt/usb
Merging tip-core/auto-core-next
Merging cpus4096/auto-cpus4096-next
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
Merging hid/mm
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
Merging infiniband/for-next
Merging acpi/test
Merging nfsd/nfsd-next
Merging ieee1394/for-next
Merging ubi/linux-next
Merging kvm/master
Merging dlm/next
Merging scsi/master
Merging ocfs2/linux-next
Merging ext4/next
Merging async_tx/next
Merging udf/for_next
Merging net/master
CONFLICT (content): Merge conflict in include/net/mac80211.h
Applying net: async_tx merge fix
Applying net: ieee80211_notify_mac merge fix
Merging mtd/master
Merging crypto/master
Merging vfs/for-next
Merging sound/for-next
Merging cpufreq/next
Merging v9fs/for-next
Merging quilt/rr
CONFLICT (content): Merge conflict in arch/s390/include/asm/smp.h
CONFLICT (content): Merge conflict in arch/s390/kernel/smp.c
$ git reset --hard HEAD^
Merging cifs/master
Merging mmc/next
Merging gfs2/master
Merging input/next
Merging semaphore/semaphore
Merging bkl-removal/bkl-removal
Merging ubifs/linux-next
Merging lsm/for-next
Merging block/for-next
Merging embedded/master
Merging firmware/master
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
CONFLICT (delete/modify): drivers/net/wan/syncppp.c deleted in hdlc/hdlc-next and modified in HEAD. Version HEAD of drivers/net/wan/syncppp.c left in tree.
$ git rm -f drivers/net/wan/syncppp.c
Merging drm/drm-next
Merging voltage/for-next
Merging security-testing/next
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/xfs_vnodeops.h
Merging lblnet/master
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
CONFLICT (content): Merge conflict in fs/proc/base.c
CONFLICT (content): Merge conflict in kernel/exit.c
$ git reset --hard HEAD^
Merging bdev/master
Merging dwmw2-iommu/master
Merging cpu_alloc/cpu_alloc
CONFLICT (content): Merge conflict in kernel/lockdep.c
CONFLICT (content): Merge conflict in kernel/module.c
Applying cpu_alloc: merge_fix_1
Applying undefined reference to __per_cpu_start
Merging cputime/cputime
Merging perfmon3/master
Merging osd/linux-next
Merging fatfs/master
Merging quilt/staging
Merging scsi-post-merge/master
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply
* Re: linux-next: proc tree build failure
From: Eric W. Biederman @ 2008-11-20 8:43 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Alexey Dobriyan, linux-next
In-Reply-To: <20081120172425.135c8cf8.sfr@canb.auug.org.au>
Stephen Rothwell <sfr@canb.auug.org.au> writes:
> Hi Alexey,
>
> Today's linux-next build (x86_64 allmodconfig) failed like this:
>
> security/selinux/hooks.c: In function 'selinux_proc_get_sid':
> security/selinux/hooks.c:1182: error: 'struct super_block' has no member named
> 'type'
> security/selinux/hooks.c:1183: error: 'struct super_block' has no member named
> 'type'
> security/selinux/hooks.c:1189: error: too few arguments to function 'memcpy'
>
> Caused by commit e23b822350796e690a46873058d220878a18564c ("proc:
> make /proc/net it's own filesystem"). This has clearly never been
> compiled with CONFIG_PROC_FS set!
Nah. Never compiled with CONFIG_SELINUX set. I thought I had compile
tested that case but apparently not.
Sorry there was some stupid security drama going on when these patches
were written and that always seems to throws me off and reduces the
quality of my code.
Eric
^ permalink raw reply
* Re: linux-next: manual merge of the wireless tree
From: David Miller @ 2008-11-20 8:27 UTC (permalink / raw)
To: sfr; +Cc: linville, linux-next, johannes, tomas.winkler, reinette.chatre,
yi.zhu
In-Reply-To: <20081120140750.1373326e.sfr@canb.auug.org.au>
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 20 Nov 2008 14:07:50 +1100
> Today's linux-next merge of the wireless tree got a conflict in
> drivers/net/wireless/iwlwifi/iwl-rx.c between commit
> 4018517a1a69a85c3d61b20fa02f187b80773137 ("iwlagn: fix RX skb alignment")
> from the wireless-current tree and commit
> 07e27f25d0c73f42562473f642f20b8fa996a9de ("iwlwifi: move rx queue read
> pointer into rxq") from the wireless tree.
>
> I wasn't sure how to resolve the conflict so have dropped the wireless
> tree for today. I assume it will be fixed in the wireless (or net) tree
> soon.
I'll sort these out with John somehow, thanks for the report
Stephen,
^ permalink raw reply
* Re: [PATCH] Fix arch/x86/kernel/setup.c build warning when !CONFIG_X86_RESERVE_LOW_64K
From: Ingo Molnar @ 2008-11-20 8:04 UTC (permalink / raw)
To: Richard A. Holden III
Cc: linux-next, linux-kernel, Thomas Gleixner, Ingo Molnar,
H. Peter Anvin
In-Reply-To: <1227135915-32628-2-git-send-email-aciddeath@gmail.com>
* Richard A. Holden III <aciddeath@gmail.com> wrote:
> Fix
> arch/x86/kernel/setup.c:592: warning: 'dmi_low_memory_corruption' defined but not used
>
> this is only used if CONFIG_X86_RESERVE_LOW_64K is defined.
>
> Signed-off-by: Richard A. Holden III <aciddeath@gmail.com>
> Cc: Thomas Gleixner <tglx@linutronix.de>
> Cc: Ingo Molnar <mingo@redhat.com>
> Cc: H. Peter Anvin <hpa@zytor.com>
> ---
> arch/x86/kernel/setup.c | 2 ++
> 1 files changed, 2 insertions(+), 0 deletions(-)
applied to tip/x86/memory-corruption-check, thanks Richard!
Ingo
^ permalink raw reply
* Re: [PATCH] Fix arch/x86/kernel/genx2apic_uv_x.c build warning when !CONFIG_HOTPLUG_CPU
From: Ingo Molnar @ 2008-11-20 8:03 UTC (permalink / raw)
To: Richard A. Holden III
Cc: linux-next, linux-kernel, Thomas Gleixner, Ingo Molnar,
H. Peter Anvin
In-Reply-To: <1227135915-32628-1-git-send-email-aciddeath@gmail.com>
* Richard A. Holden III <aciddeath@gmail.com> wrote:
> Fix
> arch/x86/kernel/genx2apic_uv_x.c:403: warning: 'uv_heartbeat_disable' defined but not used
>
> the function is only used when CONFIG_HOTPLUG_CPU is defined.
applied to tip/x86/uv, thanks Richard!
Ingo
^ permalink raw reply
* linux-next: proc tree build failure
From: Stephen Rothwell @ 2008-11-20 6:24 UTC (permalink / raw)
To: Alexey Dobriyan; +Cc: linux-next, Eric W. Biederman
[-- Attachment #1: Type: text/plain, Size: 821 bytes --]
Hi Alexey,
Today's linux-next build (x86_64 allmodconfig) failed like this:
security/selinux/hooks.c: In function 'selinux_proc_get_sid':
security/selinux/hooks.c:1182: error: 'struct super_block' has no member named 'type'
security/selinux/hooks.c:1183: error: 'struct super_block' has no member named 'type'
security/selinux/hooks.c:1189: error: too few arguments to function 'memcpy'
Caused by commit e23b822350796e690a46873058d220878a18564c ("proc:
make /proc/net it's own filesystem"). This has clearly never been
compiled with CONFIG_PROC_FS set! I have dropped the proc tree for today.
Much better testing is required - this should never have been submitted
to linux-next in this state.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply
* linux-next: manual merge of the proc tree
From: Stephen Rothwell @ 2008-11-20 6:12 UTC (permalink / raw)
To: Alexey Dobriyan
Cc: linux-next, Eric W. Biederman, David Howells, James Morris
Hi Alexey,
Today's linux-next merge of the proc tree got a conflict in kernel/exit.c
between commit c69e8d9c01db2adc503464993c358901c9af9de4 ("CRED: Use RCU
to access another task's creds and to release a task's own creds") from
the security-testing tree and commit
214ce93109bdec6fa474c8f742d56911180a8d4a ("proc: implement support for
automounts in task directories") from the proc tree.
I fixed it up (see below) and can carry the fix.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
diff --cc kernel/exit.c
index 048065d,abd5bd4..0000000
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@@ -166,10 -164,8 +166,11 @@@ void release_task(struct task_struct *
int zap_leader;
repeat:
tracehook_prepare_release_task(p);
- atomic_dec(&p->user->processes);
+ /* don't need to get the RCU readlock here - the process is dead and
+ * can't be modifying its own credentials */
+ atomic_dec(&__task_cred(p)->user->processes);
+
+ proc_shrink_automounts();
proc_flush_task(p);
write_lock_irq(&tasklist_lock);
tracehook_finish_release_task(p);
^ permalink raw reply
* linux-next: manual merge of the proc tree
From: Stephen Rothwell @ 2008-11-20 6:05 UTC (permalink / raw)
To: Alexey Dobriyan
Cc: linux-next, Eric W. Biederman, David Howells, James Morris
Hi Alexey,
Today's linux-next merge of the proc tree got a conflict in
fs/proc/base.c between commit c69e8d9c01db2adc503464993c358901c9af9de4
("CRED: Use RCU to access another task's creds and to release a task's
own creds") from the security-testing tree and commit
e19b45ac5884142791216739fa077cebe626e085 ("proc: don't show the
wrong /proc/net after unshare") from the proc tree.
Just a trivial overlap. I fixed it up (see below) and can carry the fix.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
diff --cc fs/proc/base.c
index cf42c42,250154f..0000000
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@@ -1490,8 -1510,7 +1517,9 @@@ static int pid_revalidate(struct dentr
{
struct inode *inode = dentry->d_inode;
struct task_struct *task = get_proc_task(inode);
+ const struct cred *cred;
+ int ret = 0;
+
if (task) {
if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
task_dumpable(task)) {
^ permalink raw reply
* linux-next: manual merge of the security-testing tree
From: Stephen Rothwell @ 2008-11-20 5:37 UTC (permalink / raw)
To: James Morris; +Cc: linux-next, David Howells, Tiger Yang, Mark Fasheh, Jan Kara
Hi James,
Today's linux-next merge of the security-testing tree got a conflict in
fs/ocfs2/namei.c between commit 8b50970dda2c81dfbd120ae650fcf5439f268f37
("[PATCH 01/10] ocfs2: move new inode allocation out of the transaction")
from the ocsf2 tree and commit b19c2a3b839b9dfb3f258e8943dc3784ae20c7b0
("CRED: Wrap task credential accesses in the OCFS2 filesystem") from the
security-testing tree.
I fixed it up (see below) and can carry it. The ocfs2 tree change moved
the place where the security-testing tree change to this file needs to be
made. The below patch could be applied to the ocfs2 tree (as part of the
above security-testing patch as all its dependencies are already upstream.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
diff --cc fs/ocfs2/namei.c
index 98fd325,2545e74..0000000
--- a/fs/ocfs2/namei.c
+++ b/fs/ocfs2/namei.c
@@@ -187,34 -186,6 +187,34 @@@ bail
return ret;
}
+static struct inode *ocfs2_get_init_inode(struct inode *dir, int mode)
+{
+ struct inode *inode;
+
+ inode = new_inode(dir->i_sb);
+ if (!inode) {
+ mlog(ML_ERROR, "new_inode failed!\n");
+ return NULL;
+ }
+
+ /* populate as many fields early on as possible - many of
+ * these are used by the support functions here and in
+ * callers. */
+ if (S_ISDIR(mode))
+ inode->i_nlink = 2;
+ else
+ inode->i_nlink = 1;
- inode->i_uid = current->fsuid;
++ inode->i_uid = current_fsuid();
+ if (dir->i_mode & S_ISGID) {
+ inode->i_gid = dir->i_gid;
+ if (S_ISDIR(mode))
+ mode |= S_ISGID;
+ } else
- inode->i_gid = current->fsgid;
++ inode->i_gid = current_fsgid();
+ inode->i_mode = mode;
+ return inode;
+}
+
static int ocfs2_mknod(struct inode *dir,
struct dentry *dentry,
int mode,
^ permalink raw reply
* Re: linux-next: md tree build warnings
From: rae l @ 2008-11-20 5:21 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Neil Brown, linux-next, Andrew Morton
In-Reply-To: <20081120161056.47b6130e.sfr@canb.auug.org.au>
On Thu, Nov 20, 2008 at 1:10 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Neil,
>
> Today's linux-next build (powerpc ppc64_defconfig) produced these new
> warnings:
>
> drivers/md/md.c: In function 'print_sb_1':
> drivers/md/md.c:1698: warning: format '%Ld' expects type 'long long int', but argument 3 has type '__le64'
> drivers/md/md.c:1698: warning: format '%Ld' expects type 'long long int', but argument 7 has type '__le64'
> drivers/md/md.c:1698: warning: format '%Ld' expects type 'long long int', but argument 8 has type '__le64'
> drivers/md/md.c:1698: warning: format '%Ld' expects type 'long long int', but argument 9 has type '__le64'
> drivers/md/md.c:1698: warning: format '%Ld' expects type 'long long int', but argument 10 has type '__le64'
> drivers/md/md.c:1698: warning: format '%Lu' expects type 'long long unsigned int', but argument 29 has type '__le64'
> drivers/md/md.c:1698: warning: format '%Ld' expects type 'long long int', but argument 30 has type '__le64'
> drivers/md/md.c:1698: warning: format '%Ld' expects type 'long long int', but argument 31 has type '__le64'
>
> Added by commit 4c3da1f23cf20603339493525adf8903a5722417 "md: need
> another print_sb for mdp_superblock_1". We cast 64 bit quantities to
> "unsigned long long" when we print them since they are just "unsigned
> long" on some architectures. Also since they are __le64, will they print
> anything useful on a big endian architecture?
That's my problem, I'm checking __le64 to cpu_le64 at once, and will
post another patch later.
>
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
> http://www.canb.auug.org.au/~sfr/
>
--
Cheng Renquan, Shenzhen, China
Dan Quayle - "This President is going to lead us out of this recovery."
^ permalink raw reply
* Re: linux-next: md tree build warnings
From: NeilBrown @ 2008-11-20 5:24 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, Cheng Renquan, Andrew Morton
In-Reply-To: <20081120161056.47b6130e.sfr@canb.auug.org.au>
On Thu, November 20, 2008 4:10 pm, Stephen Rothwell wrote:
> Hi Neil,
>
> Today's linux-next build (powerpc ppc64_defconfig) produced these new
> warnings:
>
> drivers/md/md.c: In function 'print_sb_1':
> drivers/md/md.c:1698: warning: format '%Ld' expects type 'long long int',
> but argument 3 has type '__le64'
> drivers/md/md.c:1698: warning: format '%Ld' expects type 'long long int',
> but argument 7 has type '__le64'
> drivers/md/md.c:1698: warning: format '%Ld' expects type 'long long int',
> but argument 8 has type '__le64'
> drivers/md/md.c:1698: warning: format '%Ld' expects type 'long long int',
> but argument 9 has type '__le64'
> drivers/md/md.c:1698: warning: format '%Ld' expects type 'long long int',
> but argument 10 has type '__le64'
> drivers/md/md.c:1698: warning: format '%Lu' expects type 'long long
> unsigned int', but argument 29 has type '__le64'
> drivers/md/md.c:1698: warning: format '%Ld' expects type 'long long int',
> but argument 30 has type '__le64'
> drivers/md/md.c:1698: warning: format '%Ld' expects type 'long long int',
> but argument 31 has type '__le64'
>
> Added by commit 4c3da1f23cf20603339493525adf8903a5722417 "md: need
> another print_sb for mdp_superblock_1". We cast 64 bit quantities to
> "unsigned long long" when we print them since they are just "unsigned
> long" on some architectures. Also since they are __le64, will they print
> anything useful on a big endian architecture?
Thanks. Insufficient review on my part. I'll get it sorted before you
next pull.
NeilBrown
^ permalink raw reply
* Re: linux-next: md tree build warnings
From: Stephen Rothwell @ 2008-11-20 5:20 UTC (permalink / raw)
To: Neil Brown; +Cc: linux-next, Cheng Renquan, Andrew Morton
In-Reply-To: <20081120161056.47b6130e.sfr@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1343 bytes --]
Hi Neil,
On Thu, 20 Nov 2008 16:10:56 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next build (powerpc ppc64_defconfig) produced these new
> warnings:
>
> drivers/md/md.c: In function 'print_sb_1':
> drivers/md/md.c:1698: warning: format '%Ld' expects type 'long long int', but argument 3 has type '__le64'
> drivers/md/md.c:1698: warning: format '%Ld' expects type 'long long int', but argument 7 has type '__le64'
> drivers/md/md.c:1698: warning: format '%Ld' expects type 'long long int', but argument 8 has type '__le64'
> drivers/md/md.c:1698: warning: format '%Ld' expects type 'long long int', but argument 9 has type '__le64'
> drivers/md/md.c:1698: warning: format '%Ld' expects type 'long long int', but argument 10 has type '__le64'
> drivers/md/md.c:1698: warning: format '%Lu' expects type 'long long unsigned int', but argument 29 has type '__le64'
> drivers/md/md.c:1698: warning: format '%Ld' expects type 'long long int', but argument 30 has type '__le64'
> drivers/md/md.c:1698: warning: format '%Ld' expects type 'long long int', but argument 31 has type '__le64'
This was especially noticeable because it more than doubled the number of
warnings from that build :-(
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply
* linux-next: md tree build warnings
From: Stephen Rothwell @ 2008-11-20 5:10 UTC (permalink / raw)
To: Neil Brown; +Cc: linux-next, Cheng Renquan, Andrew Morton
[-- Attachment #1: Type: text/plain, Size: 1460 bytes --]
Hi Neil,
Today's linux-next build (powerpc ppc64_defconfig) produced these new
warnings:
drivers/md/md.c: In function 'print_sb_1':
drivers/md/md.c:1698: warning: format '%Ld' expects type 'long long int', but argument 3 has type '__le64'
drivers/md/md.c:1698: warning: format '%Ld' expects type 'long long int', but argument 7 has type '__le64'
drivers/md/md.c:1698: warning: format '%Ld' expects type 'long long int', but argument 8 has type '__le64'
drivers/md/md.c:1698: warning: format '%Ld' expects type 'long long int', but argument 9 has type '__le64'
drivers/md/md.c:1698: warning: format '%Ld' expects type 'long long int', but argument 10 has type '__le64'
drivers/md/md.c:1698: warning: format '%Lu' expects type 'long long unsigned int', but argument 29 has type '__le64'
drivers/md/md.c:1698: warning: format '%Ld' expects type 'long long int', but argument 30 has type '__le64'
drivers/md/md.c:1698: warning: format '%Ld' expects type 'long long int', but argument 31 has type '__le64'
Added by commit 4c3da1f23cf20603339493525adf8903a5722417 "md: need
another print_sb for mdp_superblock_1". We cast 64 bit quantities to
"unsigned long long" when we print them since they are just "unsigned
long" on some architectures. Also since they are __le64, will they print
anything useful on a big endian architecture?
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply
* Re: linux-next: manual merge of the rr tree
From: Rusty Russell @ 2008-11-20 4:28 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, Martin Schwidefsky, Heiko Carstens
In-Reply-To: <20081120142404.7dc7df09.sfr@canb.auug.org.au>
On Thursday 20 November 2008 13:54:04 Stephen Rothwell wrote:
> Hi Rusty,
>
> Today's linux-next merge of the rr tree got a conflict in
> arch/s390/include/asm/smp.h arch/s390/kernel/smp.c between commit
> 32d13157b60c5499c858adaecb6a01873ff9a81a ("[S390] convert s390 to generic
> IPI infrastructure") from the s390 tree and commit
> 0a74a1ee6aaf74b687d649be3196c17f148127ea
> ("cpumask:smp_call_function_many") from the rr tree.
>
> I think (I may be wrong) that the s390 tree change has removed the need
> for the rr tree change to touch the s390 files. I fixed it up
> accordingly and can carry the fix.
That's great, I didn't know they were doing that.
Thanks, I'll drop that part of the patch.
Rusty.
^ permalink raw reply
* linux-next: rr tree build failure
From: Stephen Rothwell @ 2008-11-20 3:50 UTC (permalink / raw)
To: Rusty Russell; +Cc: linux-next
[-- Attachment #1: Type: text/plain, Size: 410 bytes --]
Hi Rusty,
Today's linux-next build (x86_64 allmodconfig) failed like this:
drivers/usb/core/usb.c:958: error: expected ')' before 'bool'
line 958 is:
core_param(nousb, nousb, bool, 0444);
core_param is only defined for !MODULE in moduleparam.h ...
I have dropped the rr tree for today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply
* linux-next: manual merge of the rr tree
From: Stephen Rothwell @ 2008-11-20 3:24 UTC (permalink / raw)
To: Rusty Russell; +Cc: linux-next, Martin Schwidefsky, Heiko Carstens
[-- Attachment #1: Type: text/plain, Size: 644 bytes --]
Hi Rusty,
Today's linux-next merge of the rr tree got a conflict in
arch/s390/include/asm/smp.h arch/s390/kernel/smp.c between commit
32d13157b60c5499c858adaecb6a01873ff9a81a ("[S390] convert s390 to generic
IPI infrastructure") from the s390 tree and commit
0a74a1ee6aaf74b687d649be3196c17f148127ea
("cpumask:smp_call_function_many") from the rr tree.
I think (I may be wrong) that the s390 tree change has removed the need
for the rr tree change to touch the s390 files. I fixed it up
accordingly and can carry the fix.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply
* linux-next: manual merge of the wireless tree
From: Stephen Rothwell @ 2008-11-20 3:07 UTC (permalink / raw)
To: John W. Linville
Cc: linux-next, Johannes Berg, Winkler, Tomas, Reinette Chatre,
Zhu, Yi
[-- Attachment #1: Type: text/plain, Size: 627 bytes --]
Hi John,
Today's linux-next merge of the wireless tree got a conflict in
drivers/net/wireless/iwlwifi/iwl-rx.c between commit
4018517a1a69a85c3d61b20fa02f187b80773137 ("iwlagn: fix RX skb alignment")
from the wireless-current tree and commit
07e27f25d0c73f42562473f642f20b8fa996a9de ("iwlwifi: move rx queue read
pointer into rxq") from the wireless tree.
I wasn't sure how to resolve the conflict so have dropped the wireless
tree for today. I assume it will be fixed in the wireless (or net) tree
soon.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply
* linux-next: net tree build failure
From: Stephen Rothwell @ 2008-11-20 2:58 UTC (permalink / raw)
To: David Miller
Cc: linux-next, Zhu, Yi, John W. Linville, Reinette Chatre,
Johannes Berg
Hi Dave,
Today's linux-next build (x86_64 allmodconfig) failed like this:
drivers/net/wireless/iwlwifi/iwl3945-base.c: In function 'iwl3945_bg_set_monitor':
drivers/net/wireless/iwlwifi/iwl3945-base.c:6001: error: implicit declaration of function 'ieee80211_notify_mac'
drivers/net/wireless/iwlwifi/iwl3945-base.c:6001: error: 'IEEE80211_NOTIFY_RE_ASSOC' undeclared (first use in this function)
drivers/net/wireless/iwlwifi/iwl-agn.c: In function 'iwl_bg_set_monitor':
drivers/net/wireless/iwlwifi/iwl-agn.c:2392: error: implicit declaration of function 'ieee80211_notify_mac'
drivers/net/wireless/iwlwifi/iwl-agn.c:2392: error: 'IEEE80211_NOTIFY_RE_ASSOC' undeclared (first use in this function)
Another bad interaction, this time between commit
8e3bad65a59915f2ddc40f62a180ad81695d8440 "mac80211: remove
ieee80211_notify_mac" from the wireless-current tree and commit
60294de3af99586bb4a205274d02a7c8b910c0c3 "iwlwifi: fix priv->iw_mode
setting when multiple vif are configured" from the net tree.
I added the following (which may not be correct) to fix the merge but
assume it will be fixed in the net tree soon.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
@@ -5998,7 +5998,6 @@ static void iwl3945_bg_set_monitor(struct work_struct *work)
IWL_ERROR("iwl3945_set_mode() failed\n");
mutex_unlock(&priv->mutex);
- ieee80211_notify_mac(priv->hw, IEEE80211_NOTIFY_RE_ASSOC);
}
#define IWL_SCAN_CHECK_WATCHDOG (7 * HZ)
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -2389,7 +2389,6 @@ static void iwl_bg_set_monitor(struct work_struct *work)
}
mutex_unlock(&priv->mutex);
- ieee80211_notify_mac(priv->hw, IEEE80211_NOTIFY_RE_ASSOC);
}
static void iwl_bg_run_time_calib_work(struct work_struct *work)
^ permalink raw reply
* linux-next: net tree build failure
From: Stephen Rothwell @ 2008-11-20 2:30 UTC (permalink / raw)
To: David Miller; +Cc: linux-next, Dan Williams, Eric W. Biederman
Hi Dave,
Today's linux-next build (powerpc ppc64_defconfig) failed like this:
net/core/dev.c: In function 'net_dev_init':
net/core/dev.c:4775: error: implicit declaration of function 'netdev_dma_register'
A bad interaction between commit 505d4f73dda9e20d59da05008f1f5eb432613e71
"net: Guaranetee the proper ordering of the loopback device. v2" from the
net tree (which moved a call to netdev_dma_register) and commit
8f3da0d613494b02f8628bb5dbf2366f0298505c "dmaengine: kill struct
dma_client and supporting infrastructure" from the async_tx tree (which
removes the call).
I added the below patch to fix up the merge and can carry it.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
>From 97115a9dfb4eda07a4f581d46379de9f0f65f158 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 20 Nov 2008 13:25:08 +1100
Subject: [PATCH] net: async_tx merge fix
---
net/core/dev.c | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/net/core/dev.c b/net/core/dev.c
index c3f5713..e9cf36e 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -4772,8 +4772,6 @@ static int __init net_dev_init(void)
if (register_pernet_device(&default_device_ops))
goto out;
- netdev_dma_register();
-
open_softirq(NET_TX_SOFTIRQ, net_tx_action);
open_softirq(NET_RX_SOFTIRQ, net_rx_action);
--
1.5.6.5
^ permalink raw reply related
* linux-next: manual merge of the net tree
From: Stephen Rothwell @ 2008-11-20 2:10 UTC (permalink / raw)
To: David Miller; +Cc: linux-next, Johannes Berg, John W. Linville
Hi Dave,
Today's linux-next merge of the net tree got a conflict in
include/net/mac80211.h between commit
8e3bad65a59915f2ddc40f62a180ad81695d8440 ("mac80211: remove
ieee80211_notify_mac") from the wireless-current tree and commit
ae5eb02641233a4e9d1b92d22090f1b1afa14466 ("mac80211: rewrite HT
handling") from the net tree.
I fixed it up (see below) but assume it will be fixed soon.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
diff --cc include/net/mac80211.h
index 73d81bc,5385600..0000000
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@@ -74,22 -74,14 +74,6 @@@
*/
/**
- * struct ieee80211_ht_bss_info - describing BSS's HT characteristics
- *
- * This structure describes most essential parameters needed
- * to describe 802.11n HT characteristics in a BSS.
- *
- * @primary_channel: channel number of primery channel
- * @bss_cap: 802.11n's general BSS capabilities (e.g. channel width)
- * @bss_op_mode: 802.11n's BSS operation modes (e.g. HT protection)
- */
- struct ieee80211_ht_bss_info {
- u8 primary_channel;
- u8 bss_cap; /* use IEEE80211_HT_IE_CHA_ */
- u8 bss_op_mode; /* use IEEE80211_HT_IE_ */
- };
-
- /**
- * enum ieee80211_notification_type - Low level driver notification
- * @IEEE80211_NOTIFY_RE_ASSOC: start the re-association sequence
- */
-enum ieee80211_notification_types {
- IEEE80211_NOTIFY_RE_ASSOC,
-};
-
-/**
* enum ieee80211_max_queues - maximum number of queues
*
* @IEEE80211_MAX_QUEUES: Maximum number of regular device queues.
^ permalink raw reply
* Re: linux-next: Tree for November 19 (v4l2 warnings)
From: Stephen Rothwell @ 2008-11-20 0:02 UTC (permalink / raw)
To: Mauro Carvalho Chehab; +Cc: linux-next, LKML, Randy Dunlap
In-Reply-To: <20081119105100.26de5ff0.randy.dunlap@oracle.com>
[-- Attachment #1: Type: text/plain, Size: 893 bytes --]
Hi Mauro,
On Wed, 19 Nov 2008 10:51:00 -0800 Randy Dunlap <randy.dunlap@oracle.com> wrote:
>
> On Wed, 19 Nov 2008 17:59:17 +1100 Stephen Rothwell wrote:
(Randy, I didn't really ...)
> drivers/media/video/v4l2-ioctl.c:1819: warning: format '%d' expects type 'int', but argument 3 has type 'struct v4l2_fract'
> drivers/media/video/v4l2-ioctl.c:1819: warning: format '%d' expects type 'int', but argument 4 has type 'struct v4l2_fract'
> drivers/media/video/v4l2-ioctl.c:1819: warning: format '%d' expects type 'int', but argument 5 has type 'struct v4l2_fract'
Introduced in commit b35e0c6035369de9f3273b6a3fbb1c67f830cf49 "4L/DVB
(9578): v4l core: add support for enumerating frame sizes and intervals"
and been there for some time now.
Mauro, please fix this.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply
* linux-next: manual merge of the s390 tree
From: Stephen Rothwell @ 2008-11-19 23:13 UTC (permalink / raw)
To: Martin Schwidefsky, Heiko Carstens
Cc: linux-next, David Gibson, Paul Mackerras, Hendrik Brueckner
Hi Martin,
Today's linux-next merge of the s390 tree got a conflict in
drivers/char/Kconfig drivers/char/Makefile between commit
d5e54913433fff89609adfc4b96fefcf807a9030 ("powerpc: udbg-based backend
for hvc_console") from the powerpc tree and commit
c7f224c72b6973056497af6bb69efce6d5a19e86 ("[S390] s390/hvc_console: z/VM
IUCV hypervisor console support") from the s390 tree.
Just overlapping additions. I fixed it up (see below) and can carry the
fix. The conflict could be eliminated by one of the two sets of changes
moving slightly in the files (I am hinting about the s390 ones here as
Paul does not like rebasing his tree ...).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
diff --cc drivers/char/Kconfig
index f57907a,755adf7..0000000
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@@ -631,12 -631,16 +631,22 @@@ config HVC_XE
help
Xen virtual console device driver
+config HVC_UDBG
+ bool "udbg based fake hypervisor console"
+ depends on PPC && EXPERIMENTAL
+ select HVC_DRIVER
+ default n
+
+ config HVC_IUCV
+ bool "z/VM IUCV Hypervisor console support (VM only)"
+ depends on S390
+ select HVC_DRIVER
+ select IUCV
+ default y
+ help
+ This driver provides a Hypervisor console (HVC) back-end to access
+ a Linux (console) terminal via a z/VM IUCV communication path.
+
config VIRTIO_CONSOLE
tristate "Virtio console"
depends on VIRTIO
diff --cc drivers/char/Makefile
index 52e1552,36151ba..0000000
--- a/drivers/char/Makefile
+++ b/drivers/char/Makefile
@@@ -50,7 -50,7 +50,8 @@@ obj-$(CONFIG_HVC_BEAT) += hvc_beat.
obj-$(CONFIG_HVC_DRIVER) += hvc_console.o
obj-$(CONFIG_HVC_IRQ) += hvc_irq.o
obj-$(CONFIG_HVC_XEN) += hvc_xen.o
+obj-$(CONFIG_HVC_UDBG) += hvc_udbg.o
+ obj-$(CONFIG_HVC_IUCV) += hvc_iucv.o
obj-$(CONFIG_VIRTIO_CONSOLE) += virtio_console.o
obj-$(CONFIG_RAW_DRIVER) += raw.o
obj-$(CONFIG_SGI_SNSC) += snsc.o snsc_event.o
^ permalink raw reply
* [PATCH] Fix arch/x86/kernel/setup.c build warning when !CONFIG_X86_RESERVE_LOW_64K
From: Richard A. Holden III @ 2008-11-19 23:05 UTC (permalink / raw)
To: linux-next; +Cc: linux-kernel, Thomas Gleixner, Ingo Molnar, H. Peter Anvin
In-Reply-To: <1227135915-32628-1-git-send-email-aciddeath@gmail.com>
Fix
arch/x86/kernel/setup.c:592: warning: 'dmi_low_memory_corruption' defined but not used
this is only used if CONFIG_X86_RESERVE_LOW_64K is defined.
Signed-off-by: Richard A. Holden III <aciddeath@gmail.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
---
arch/x86/kernel/setup.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index 598435b..e417308 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -588,6 +588,7 @@ static struct x86_quirks default_x86_quirks __initdata;
struct x86_quirks *x86_quirks __initdata = &default_x86_quirks;
+#ifdef CONFIG_X86_RESERVE_LOW_64K
static int __init dmi_low_memory_corruption(const struct dmi_system_id *d)
{
printk(KERN_NOTICE
@@ -599,6 +600,7 @@ static int __init dmi_low_memory_corruption(const struct dmi_system_id *d)
return 0;
}
+#endif
/* List of systems that have known low memory corruption BIOS problems */
static struct dmi_system_id __initdata bad_bios_dmi_table[] = {
--
1.5.6.4
^ permalink raw reply related
* [PATCH] Fix arch/x86/kernel/genx2apic_uv_x.c build warning when !CONFIG_HOTPLUG_CPU
From: Richard A. Holden III @ 2008-11-19 23:05 UTC (permalink / raw)
To: linux-next; +Cc: linux-kernel, Thomas Gleixner, Ingo Molnar, H. Peter Anvin
Fix
arch/x86/kernel/genx2apic_uv_x.c:403: warning: 'uv_heartbeat_disable' defined but not used
the function is only used when CONFIG_HOTPLUG_CPU is defined.
Signed-off-by: Richard A. Holden III <aciddeath@gmail.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
---
arch/x86/kernel/genx2apic_uv_x.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/x86/kernel/genx2apic_uv_x.c b/arch/x86/kernel/genx2apic_uv_x.c
index fb80b17..3076bc6 100644
--- a/arch/x86/kernel/genx2apic_uv_x.c
+++ b/arch/x86/kernel/genx2apic_uv_x.c
@@ -399,6 +399,7 @@ static void __cpuinit uv_heartbeat_enable(int cpu)
uv_heartbeat_enable(0);
}
+#ifdef CONFIG_HOTPLUG_CPU
static void __cpuinit uv_heartbeat_disable(int cpu)
{
if (uv_cpu_hub_info(cpu)->scir.enabled) {
@@ -408,7 +409,6 @@ static void __cpuinit uv_heartbeat_disable(int cpu)
uv_set_cpu_scir_bits(cpu, 0xff);
}
-#ifdef CONFIG_HOTPLUG_CPU
/*
* cpu hotplug notifier
*/
--
1.5.6.4
^ permalink raw reply related
* Re: [PATCH] sfc: Fix dependency for SFC_MTD
From: Randy Dunlap @ 2008-11-19 21:37 UTC (permalink / raw)
To: Ben Hutchings
Cc: David Miller, netdev, linux-net-drivers, David Woodhouse,
Stephen Rothwell, linux-next
In-Reply-To: <20081119205353.GG8240@solarflare.com>
Ben Hutchings wrote:
> Randy Dunlap found that SFC_MTD was selected when sfc was built-in and
> the MTD core was a module. Don't allow that combination.
>
> Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Acked-by: Randy Dunlap <randy.dunlap@oracle.com>
I realized that this problem came up because SFC_MTD is a boolean
that depends on tristates, so the boolean is set (=y) when
SFC=y or SFC=m. Thus extra handling for it is needed,
like Ben did here.
> ---
> drivers/net/sfc/Kconfig | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> Now with S-o-b; sorry for the spam.
>
> Ben.
>
> diff --git a/drivers/net/sfc/Kconfig b/drivers/net/sfc/Kconfig
> index 3e25fb3..c535408 100644
> --- a/drivers/net/sfc/Kconfig
> +++ b/drivers/net/sfc/Kconfig
> @@ -14,7 +14,7 @@ config SFC
> will be called sfc.
> config SFC_MTD
> bool "Solarflare Solarstorm SFC4000 flash MTD support"
> - depends on SFC && MTD
> + depends on SFC && MTD && !(SFC=y && MTD=m)
> default y
> help
> This exposes the on-board flash memory as an MTD device (e.g.
^ 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