gmane.linux.kernel.next

Re: linux-next: build failure after merge of the crypto tree

Herbert Xu — 2013-05-24T09:57:15

Sorry for the late response, it should be fixed now.

Thanks!

Re: linux-next: Tree for May 23 (asus-wmi)

Randy Dunlap — 2013-05-23T16:13:29


when CONFIG_ACPI_VIDEO=m and ASUS_WMI=y:

drivers/built-in.o: In function `asus_wmi_add':
asus-wmi.c:(.text+0x252514): undefined reference to `acpi_video_unregister'

Re: [PATCH mainline] lib: make iovec obj instead of lib

Rusty Russell — 2013-05-23T07:14:35

Acked-by: Rusty Russell <rusty< at >rustcorp.com.au>

Thanks!
Rusty.

linux-next: Tree for May 23

Stephen Rothwell — 2013-05-23T05:49:24

Hi all,

There will be no linux-next release tomorrow.

Changes since 20130522:

The crypto tree still had its build failure so I used the version from
next-20130520.

The vhost tree lost its build failure.

----------------------------------------------------------------------------

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/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

[PATCH mainline] lib: make iovec obj instead of lib

Randy Dunlap — 2013-05-23T05:46:09

when CONFIG_VMWARE_VMCI=m:

ERROR: "memcpy_toiovec" [drivers/misc/vmw_vmci/vmw_vmci.ko] undefined!
ERROR: "memcpy_fromiovec" [drivers/misc/vmw_vmci/vmw_vmci.ko] undefined!

Changing iovec.o from lib-y to obj-y fixes the build errors.

---
From: Randy Dunlap <rdunlap< at >infradead.org>

Fix build error io vmw_vmci.ko by chaning iovec.o from lib-y to
obj-y.

ERROR: "memcpy_toiovec" [drivers/misc/vmw_vmci/vmw_vmci.ko] undefined!
ERROR: "memcpy_fromiovec" [drivers/misc/vmw_vmci/vmw_vmci.ko] undefined!

Signed-off-by: Randy Dunlap <rdunlap< at >infradead.org>
---
 lib/Makefile |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- mmotm-2013-0522-1640.orig/lib/Makefile
+++ mmotm-2013-0522-1640/lib/Makefile
< at >< at > -9,7 +9,7 < at >< at > endif
 
 lib-y := ctype.o string.o vsprintf.o cmdline.o \
  rbtree.o radix-tree.o dump_stack.o timerqueue.o\
- idr.o int_sqrt.o extable.o iovec.o \
+ idr.o int_sqrt.o extable.o \
  sha1.o md5.o irq_regs.o reciprocal_div.o argv_split.o \
  proportions.o flex_proportions.o prio_heap.o rate

Re: [PATCH linux-next] Driver core: cpu: remove not needed anymore hotplugable_cpu_attr_groups[]

Stephen Rothwell — 2013-05-23T00:32:22

Hi Igor,

On Wed, 22 May 2013 15:53:32 +0200 Igor Mammedov <imammedo< at >redhat.com> wrote:

I have integrated this into my merge resolution, thanks.

Re: linux-next: build warning after merge of the final tree (net-next tree related)

David Miller — 2013-05-22T19:26:24

From: Emilio López <emilio< at >elopez.com.ar>
Date: Wed, 22 May 2013 10:24:28 -0300


Your patch series is in my tree and will not be reverted, we never do
that.  Therefore you must send me patches which fix up these problems.

Re: [PATCH] tty: mxser: Fix build warning introduced by dfc7b837c7f9 (Re: linux-next: build warning after merge of the tty.current tree)

Greg KH — 2013-05-22T15:35:30

You forgot to add "reported-by:" :(

I'll go do it by hand...

thanks,

greg k-h

[PATCH linux-next] Driver core: cpu: remove not needed anymore hotplugable_cpu_attr_groups[]

Igor Mammedov — 2013-05-22T13:53:32

after fixing conflict between
0902a9044 "Driver core: Use generic offline/online
for CPU offline/online"

and

1c4e2d70a "cpu: make sure that cpu/online file created
before KOBJ_ADD is emitted"

there was left some not needed remnants of the last
commit, remove them since the first commit does the
same thing in another way.

Signed-off-by: Igor Mammedov <imammedo< at >redhat.com>
---
PS:
Alernative way is just to drop 1c4e2d70a if rebase of tree
is acceptable.

---
 drivers/base/cpu.c |    9 ---------
 1 files changed, 0 insertions(+), 9 deletions(-)

diff --git a/drivers/base/cpu.c b/drivers/base/cpu.c
index ff97614..130ba0b 100644
--- a/drivers/base/cpu.c
+++ b/drivers/base/cpu.c
< at >< at > -169,13 +169,6 < at >< at > static const struct attribute_group *common_cpu_attr_groups[] = {
 NULL
 };
 
-static const struct attribute_group *hotplugable_cpu_attr_groups[] = {
-#ifdef CONFIG_KEXEC
-&crash_note_cpu_attr_group,
-#endif
-NULL
-};
-
 /*
  * Print cpu online, possible, present, and system maps
  */
< at >< at > -292,8 +285,6 < at >< at > int __c

Re: linux-next: manual merge of the driver-core tree with the pm tree

Rafael J. Wysocki — 2013-05-22T11:26:37

Hi Stephen,

Thanks for fixing this up!

Hi Greg,

What about merging my acpi-hotplug branch into the driver-core tree?

That would make the Linus' life easier going forward I suppose.

Thanks,
Rafael

Re: linux-next: manual merge of the akpm tree with the net-next tree

Daniel Borkmann — 2013-05-22T09:20:51

In case this is still needed, patch attached. That should fix it.

Re: linux-next: build failure after merge of the vhost tree

Michael S. Tsirkin — 2013-05-22T09:03:40

Aha I see what happened. I fixed it and made sure the
changes build and work, but didn't commit and pushed from
a dirty tree.


vhost wants to use these changes but these patches are still
work in progress. Since the changes are all over the
tree I thought looking at how they interact with
everyone's work at an early stage is a good idea.

Of course breaking builds for everyone is not acceptable,
I'm very sorry about that.
I'll make double sure by tree is clean before push next time,
will also look at whether git push can check this automatically.

Re: linux-next: manual merge of the akpm tree with the net-next tree

David Miller — 2013-05-22T07:19:09

From: Andrew Morton <akpm< at >linux-foundation.org>
Date: Wed, 22 May 2013 00:14:58 -0700

The seccomp BPF bits we reviewed and were interested in completely, because
we're going to have to support JIT'ing all of that stuff on every cpu and
we're interested how it fits into the existing BPF codes and infrastructure.

Re: linux-next: manual merge of the akpm tree with the net-next tree

David Miller — 2013-05-22T07:07:48

From: Andrew Morton <akpm< at >linux-foundation.org>
Date: Tue, 21 May 2013 13:04:38 -0700


How about working against net-next and submitting your patches to netdev
just like the rest of the world?

There is zero reason for these changes to go through Andrew's tree.

linux-next: Tree for May 22

Stephen Rothwell — 2013-05-22T06:01:31

Hi all,

Changes since 20130521:

The crypto tree still had its build failure so I used the version from
next-20130520.

The driver-core tree gained a conflict against the pm tree.

The tty tree lost its build failure.

The vhost tree gained a conflict against the rr-fixes tree and a build
failure so I used the version from next-20130521.

The akpm tree lost a patch that turned up elsewhere.

----------------------------------------------------------------------------

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/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 fi

linux-next: build warning after merge of the final tree (drm-intel tree related)

Stephen Rothwell — 2013-05-22T05:53:20

Hi ,

After merging the final tree, today's linux-next build (i386 defconfig)
produced this warning:

drivers/gpu/drm/i915/i915_gem.c:2978:3: warning: format '%ld' expects argument of type 'long int', but argument 3 has type 'size_t' [-Wformat]

Introduced by commit e4341d0356bc ("drm/i915: Be more informative when
reporting "too large for aperture" error") from the drm-intel tree.

Re: linux-next: build failure after merge of the vhost tree

Michael S. Tsirkin — 2013-05-22T05:07:18


Looks like I pushed a wrong commit. Sorry, will fix this up ASAP.

linux-next: manual merge of the vhost tree with the rr-fixes tree

Stephen Rothwell — 2013-05-22T04:21:18

Hi Michael,

Today's linux-next merge of the vhost tree got conflicts in
include/linux/uio.h and lib/iovec.c between commit d2f83e9078b8 ("Hoist
memcpy_fromiovec/memcpy_toiovec into lib/") from the rr-fixes tree and
commit 48f0d22c9a46 ("Hoist memcpy_fromiovec into lib/") from the vhost
tree.

The latter was an older version of the former, so I just use the former
and can carry the fix as necessary (no action is required).

Re: linux-next: manual merge of the driver-core tree with the pm tree

Stephen Rothwell — 2013-05-22T04:02:13

Hi all,

On Wed, 22 May 2013 13:47:41 +1000 Stephen Rothwell <sfr< at >canb.auug.org.au> wrote:

OK, after doing that I got this error:

drivers/base/cpu.c:75:3: error: 'dev_attr_online' undeclared here (not in a function)
  &dev_attr_online.attr,
   ^

So I applied this merge fix patch:

diff --git a/drivers/base/cpu.c b/drivers/base/cpu.c
index 811bb5a..ff97614 100644
--- a/drivers/base/cpu.c
+++ b/drivers/base/cpu.c
< at >< at > -71,15 +71,6 < at >< at > static int cpu_subsys_offline(struct device *dev)
 return ret;
 }
 
-static struct attribute *hotplug_cpu_attrs[] = {
-&dev_attr_online.attr,
-NULL
-};
-
-static struct attribute_group hotplug_cpu_attr_group = {
-.attrs = hotplug_cpu_attrs,
-};
-
 void unregister_cpu(struct cpu *cpu)
 {
 int logical_cpu = cpu->dev.id;
< at >< at > -182,9 +173,6 < at >< at > static const struct attribute_group *hotplugable_cpu_attr_groups[] = {
 #ifdef CONFIG_KEXEC
 &crash_note_cpu_attr_group,
 #endif
-#ifdef CONFIG_HOTPLUG_CPU
-&hotplug_cpu_attr_group,
-#endif
 NULL
 };
 
Better ideas welcome :-)

linux-next: manual merge of the driver-core tree with the pm tree

Stephen Rothwell — 2013-05-22T03:47:41

Hi Greg,

Today's linux-next merge of the driver-core tree got a conflict in
drivers/base/cpu.c between commit 0902a9044fa5 ("Driver core: Use generic
offline/online for CPU offline/online") from the pm tree and commit
1c4e2d70afb1 ("cpu: make sure that cpu/online file created before
KOBJ_ADD is emitted") from the driver-core tree.

I fixed it up (they do some bits in common - see below) and can carry the
fix as necessary (no action is required).

linux-next: build warning after merge of the tty.current tree

Stephen Rothwell — 2013-05-22T03:37:22

Hi Greg,

After merging the tty.current tree, today's linux-next build (x86_64
allmodconfig) produced this warning:

drivers/tty/mxser.c: In function 'mxser_ioctl':
drivers/tty/mxser.c:1680:3: warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement]
   int p;
   ^

Introduced by commit dfc7b837c7f9 ("tty: mxser: fix usage of
opmode_ioaddr").