Linux-Next discussions
 help / color / mirror / Atom feed
* Re: linux-next: xfs tree build failure
From: Stephen Rothwell @ 2009-09-02  2:00 UTC (permalink / raw)
  To: Felix Blyakher
  Cc: Christoph Hellwig, David Chinner, xfs-masters, linux-next,
	linux-kernel, Alex Elder
In-Reply-To: <F0C21C0B-E90E-44DF-B094-CC5F1DA7EDCE@sgi.com>

[-- Attachment #1: Type: text/plain, Size: 297 bytes --]

Hi Felix, Christoph,

On Tue, 1 Sep 2009 20:54:07 -0500 Felix Blyakher <felixb@sgi.com> wrote:
>
> The fix is now in official xfs tree as well.

Thanks, I will pick it up tomorrow.

-- 
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 v4l-dvb tree with Linus' tree
From: Stephen Rothwell @ 2009-09-02  2:17 UTC (permalink / raw)
  To: Mauro Carvalho Chehab; +Cc: linux-next, linux-kernel, Randy Dunlap

Hi Mauro,

Today's linux-next merge of the v4l-dvb tree got a conflict in
drivers/media/video/gspca/Kconfig between commit
b6b85048c059e3f085095e48e12ed3f7a92c88d4 ("V4L/DVB (12502): gspca -
sn9c20x: Fix gscpa sn9c20x build errors") from Linus' tree and commit
7b5ab5558fbce09584d8795bc91eb64d8c685782 ("V4L/DVB (12452):
gspca/Kconfig: Fix bad identation for USB_GSPCA_SN9C20X_EVDEV") from the
v4l-dvb tree.

I fixed it up (see below) and will carry the fix for a while.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/media/video/gspca/Kconfig
index e994dca,6ae1522..0000000
--- a/drivers/media/video/gspca/Kconfig
+++ b/drivers/media/video/gspca/Kconfig
@@@ -113,10 -122,10 +122,10 @@@ config USB_GSPCA_SN9C20
  	 module will be called gspca_sn9c20x.
  
  config USB_GSPCA_SN9C20X_EVDEV
-        bool "Enable evdev support"
+ 	bool "Enable evdev support"
 -	depends on USB_GSPCA_SN9C20X
 +	depends on USB_GSPCA_SN9C20X && INPUT
-        ---help---
- 	 Say Y here in order to enable evdev support for sn9c20x webcam button.
+ 	---help---
+ 	  Say Y here in order to enable evdev support for sn9c20x webcam button.
  
  config USB_GSPCA_SONIXB
  	tristate "SONIX Bayer USB Camera Driver"

^ permalink raw reply
* linux-next: manual merge of the net tree with Linus' tree
From: Stephen Rothwell @ 2009-09-02  3:37 UTC (permalink / raw)
  To: David Miller; +Cc: linux-next, linux-kernel, Stephen Hemminger, Roel Kluin

Hi Dave,

Today's linux-next merge of the net tree got a conflict in
drivers/net/yellowfin.c between commit
e7a5965a81a29a13cd4994fa23a6a7a1488bcdb6 ("yellowfin: Fix buffer underrun
after dev_alloc_skb() failure") from Linus' tree and commit
61357325f377889a1daffa14962d705dc814dd0e ("netdev: convert bulk of
drivers to netdev_tx_t") from the net tree.

Just context changes.  I fixed it up (see below) and will carry the fix
for a while.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/net/yellowfin.c
index c2fd618,9509477..0000000
--- a/drivers/net/yellowfin.c
+++ b/drivers/net/yellowfin.c
@@@ -346,8 -346,9 +346,9 @@@ static int netdev_ioctl(struct net_devi
  static int yellowfin_open(struct net_device *dev);
  static void yellowfin_timer(unsigned long data);
  static void yellowfin_tx_timeout(struct net_device *dev);
 -static void yellowfin_init_ring(struct net_device *dev);
 +static int yellowfin_init_ring(struct net_device *dev);
- static int yellowfin_start_xmit(struct sk_buff *skb, struct net_device *dev);
+ static netdev_tx_t yellowfin_start_xmit(struct sk_buff *skb,
+ 					struct net_device *dev);
  static irqreturn_t yellowfin_interrupt(int irq, void *dev_instance);
  static int yellowfin_rx(struct net_device *dev);
  static void yellowfin_error(struct net_device *dev, int intr_status);
@@@ -813,10 -806,11 +814,11 @@@ static int yellowfin_init_ring(struct n
  }
  #endif
  	yp->tx_tail_desc = &yp->tx_status[0];
 -	return;
 +	return 0;
  }
  
- static int yellowfin_start_xmit(struct sk_buff *skb, struct net_device *dev)
+ static netdev_tx_t yellowfin_start_xmit(struct sk_buff *skb,
+ 					struct net_device *dev)
  {
  	struct yellowfin_private *yp = netdev_priv(dev);
  	unsigned entry;

^ permalink raw reply
* linux-next: manual merge of the block tree with the ubifs tree
From: Stephen Rothwell @ 2009-09-02  5:36 UTC (permalink / raw)
  To: Jens Axboe; +Cc: linux-next, linux-kernel, Artem Bityutskiy

[-- Attachment #1: Type: text/plain, Size: 612 bytes --]

Hi Jens,

Today's linux-next merge of the block tree got a conflict in
fs/ubifs/super.c between commit 887ee17117fd23e962332b353d250ac9e090b20f
("UBIFS: remove unneeded call from ubifs_sync_fs") from the ubifs tree
and commit 0184fca792940a9e4058b2c63b3f334326a4c7af ("writeback: move
super_block argument to struct writeback_control") from the block tree.

The former removes the code that the latter changes.  I just used the
version from the ubifs tree.  I can carry this fixup as necessary.
-- 
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 block tree with the ubifs tree
From: Artem Bityutskiy @ 2009-09-02  5:42 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Jens Axboe, linux-next@vger.kernel.org,
	linux-kernel@vger.kernel.org
In-Reply-To: <20090902153657.dc174bf6.sfr@canb.auug.org.au>

On 09/02/2009 08:36 AM, ext Stephen Rothwell wrote:
> Hi Jens,
>
> Today's linux-next merge of the block tree got a conflict in
> fs/ubifs/super.c between commit 887ee17117fd23e962332b353d250ac9e090b20f
> ("UBIFS: remove unneeded call from ubifs_sync_fs") from the ubifs tree
> and commit 0184fca792940a9e4058b2c63b3f334326a4c7af ("writeback: move
> super_block argument to struct writeback_control") from the block tree.
>
> The former removes the code that the latter changes.  I just used the
> version from the ubifs tree.  I can carry this fixup as necessary.

Yeah, I remove the call because it is not needed anymore.

-- 
Best Regards,
Artem Bityutskiy (Артём Битюцкий)

^ permalink raw reply
* Re: linux-next: manual merge of the net tree with Linus' tree
From: David Miller @ 2009-09-02  7:33 UTC (permalink / raw)
  To: sfr; +Cc: linux-next, linux-kernel, shemminger, roel.kluin
In-Reply-To: <20090902133758.f96cac22.sfr@canb.auug.org.au>

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 2 Sep 2009 13:37:58 +1000

> Today's linux-next merge of the net tree got a conflict in
> drivers/net/yellowfin.c between commit
> e7a5965a81a29a13cd4994fa23a6a7a1488bcdb6 ("yellowfin: Fix buffer underrun
> after dev_alloc_skb() failure") from Linus' tree and commit
> 61357325f377889a1daffa14962d705dc814dd0e ("netdev: convert bulk of
> drivers to netdev_tx_t") from the net tree.
> 
> Just context changes.  I fixed it up (see below) and will carry the fix
> for a while.

I just merged net-2.6 into net-next-2.6 to clear this up for you.

^ permalink raw reply
* Re: linux-next: manual merge of the net tree with Linus' tree
From: Stephen Rothwell @ 2009-09-02  8:52 UTC (permalink / raw)
  To: David Miller; +Cc: linux-next, linux-kernel, shemminger, roel.kluin
In-Reply-To: <20090902.003339.204452262.davem@davemloft.net>

[-- Attachment #1: Type: text/plain, Size: 286 bytes --]

Hi Dave,

On Wed, 02 Sep 2009 00:33:39 -0700 (PDT) David Miller <davem@davemloft.net> wrote:
>
> I just merged net-2.6 into net-next-2.6 to clear this up for you.

Thanks.
-- 
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
* still FTRACE_SYSCALL_MAX compile error on linux-next?
From: Heiko Carstens @ 2009-09-02  9:12 UTC (permalink / raw)
  To: Ingo Molnar
  Cc: Jason Baron, Frederic Weisbecker, linux-next, Martin Schwidefsky

Hi Ingo,

in linux-next I still see this compile error on s390:

kernel/trace/trace_syscalls.c:13: error: 'FTRACE_SYSCALL_MAX' undeclared here (not in a function)
make[2]: *** [kernel/trace/trace_syscalls.o] Error 1

The fix for this in your tracing/core branch:
"tracing: Convert event tracing code to use NR_syscalls"

is that branch not part of linux-next?

^ permalink raw reply
* linux-next: Tree for September 2
From: Stephen Rothwell @ 2009-09-02  9:46 UTC (permalink / raw)
  To: linux-next; +Cc: LKML

[-- Attachment #1: Type: text/plain, Size: 8002 bytes --]

Hi all,

Changes since 20090901:

The xfs tree gained a build failure so I used the version from
next-20090901.

The acpi tree still has a build failure so I used the version from
next-20090831.

The v4l-dvb tree gained a conflict against Linus' tree.

The net tree gained a conflict against Linus' tree.

The block tree lost its build failure but gained a conflict against the
ubifs tree.

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

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 141 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
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
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
Merging m68k/for-next
Merging m68knommu/for-next
Merging microblaze/next
Merging mips/mips-for-linux-next
Merging parisc/next
Merging powerpc/next
CONFLICT (content): Merge conflict in kernel/gcov/Kconfig
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
CONFLICT (content): Merge conflict in net/sunrpc/cache.c
Merging nilfs2/for-next
Merging ocfs2/linux-next
Merging squashfs/master
Merging udf/for_next
Merging v9fs/for-next
Merging ubifs/linux-next
Merging xfs/master
Merging reiserfs-bkl/reiserfs/kill-bkl
Merging vfs/for-next
$ git reset --hard HEAD^
$ git reset --hard HEAD^
Merging refs/next/20090901/xfs
Merging reiserfs-bkl/reiserfs/kill-bkl
Merging vfs/for-next
Merging pci/linux-next
CONFLICT (content): Merge conflict in arch/powerpc/kernel/pci_64.c
Applying: pci: merge fixup for fundamental reset conflict with powerpc tree
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/gspca/Kconfig
CONFLICT (content): Merge conflict in drivers/media/video/sh_mobile_ceu_camera.c
Merging quota/for_next
Merging kbuild/master
Merging kconfig/for-next
CONFLICT (content): Merge conflict in scripts/extract-ikconfig
Merging ide/master
Merging libata/NEXT
Merging infiniband/for-next
Merging acpi/test
$ git reset --hard HEAD^
Merging refs/next/20090831/acpi
Merging ieee1394/for-next
Merging ubi/linux-next
Merging kvm/master
Merging dlm/next
Merging scsi/master
Merging async_tx/next
Merging net/master
CONFLICT (content): Merge conflict in drivers/net/yellowfin.c
Merging wireless/master
Merging mtd/master
Merging crypto/master
Merging sound/for-next
Merging cpufreq/next
Merging quilt/rr
CONFLICT (content): Merge conflict in drivers/net/virtio_net.c
Merging mmc/next
Merging input/next
CONFLICT (content): Merge conflict in drivers/base/platform.c
Merging lsm/for-next
Merging block/for-next
CONFLICT (content): Merge conflict in fs/ubifs/super.c
Merging quilt/device-mapper
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 mfd/for-next
CONFLICT (content): Merge conflict in drivers/input/misc/Kconfig
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
CONFLICT (content): Merge conflict in drivers/char/agp/uninorth-agp.c
Merging uwb/for-upstream
Merging watchdog/master
Merging bdev/master
Merging dwmw2-iommu/master
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/include/asm/socket.h
CONFLICT (content): Merge conflict in include/linux/rcupdate.h
CONFLICT (content): Merge conflict in kernel/fork.c
Merging oprofile/for-next
CONFLICT (content): Merge conflict in kernel/trace/ring_buffer.c
Merging edac-amd/for-next
CONFLICT (content): Merge conflict in arch/x86/kernel/smpboot.c
CONFLICT (content): Merge conflict in include/linux/topology.h
Merging percpu/for-next
CONFLICT (content): Merge conflict in arch/sh/kernel/vmlinux.lds.S
Merging sfi/sfi-test
Merging asm-generic/next
Merging hwpoison/hwpoison
Merging quilt/driver-core
CONFLICT (content): Merge conflict in drivers/base/class.c
CONFLICT (content): Merge conflict in init/main.c
Merging quilt/tty
CONFLICT (content): Merge conflict in arch/x86/include/asm/termios.h
Merging quilt/usb
Merging quilt/staging
CONFLICT (delete/modify): drivers/staging/epl/VirtualEthernetLinux.c deleted in quilt/staging and modified in HEAD. Version HEAD of drivers/staging/epl/VirtualEthernetLinux.c left in tree.
$ git rm -f drivers/staging/epl/VirtualEthernetLinux.c
Merging scsi-post-merge/master

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

^ permalink raw reply
* Re: still FTRACE_SYSCALL_MAX compile error on linux-next?
From: Ingo Molnar @ 2009-09-02 11:02 UTC (permalink / raw)
  To: Heiko Carstens
  Cc: Jason Baron, Frederic Weisbecker, linux-next, Martin Schwidefsky
In-Reply-To: <20090902091258.GA4754@osiris.boeblingen.de.ibm.com>


* Heiko Carstens <heiko.carstens@de.ibm.com> wrote:

> Hi Ingo,
> 
> in linux-next I still see this compile error on s390:
> 
> kernel/trace/trace_syscalls.c:13: error: 'FTRACE_SYSCALL_MAX' undeclared here (not in a function)
> make[2]: *** [kernel/trace/trace_syscalls.o] Error 1
> 
> The fix for this in your tracing/core branch:
> "tracing: Convert event tracing code to use NR_syscalls"
> 
> is that branch not part of linux-next?

it is, but it had open bugs so i couldnt push it for some while. 
Will push later today most likely.

	Ingo

^ permalink raw reply
* Re: still FTRACE_SYSCALL_MAX compile error on linux-next?
From: Heiko Carstens @ 2009-09-02 11:12 UTC (permalink / raw)
  To: Ingo Molnar
  Cc: Jason Baron, Frederic Weisbecker, linux-next, Martin Schwidefsky
In-Reply-To: <20090902110231.GA3910@elte.hu>

On Wed, Sep 02, 2009 at 01:02:31PM +0200, Ingo Molnar wrote:
> 
> * Heiko Carstens <heiko.carstens@de.ibm.com> wrote:
> 
> > Hi Ingo,
> > 
> > in linux-next I still see this compile error on s390:
> > 
> > kernel/trace/trace_syscalls.c:13: error: 'FTRACE_SYSCALL_MAX' undeclared here (not in a function)
> > make[2]: *** [kernel/trace/trace_syscalls.o] Error 1
> > 
> > The fix for this in your tracing/core branch:
> > "tracing: Convert event tracing code to use NR_syscalls"
> > 
> > is that branch not part of linux-next?
> 
> it is, but it had open bugs so i couldnt push it for some while. 
> Will push later today most likely.

Ok, thanks!

^ permalink raw reply
* linux-next / s390 crypto breakage
From: Heiko Carstens @ 2009-09-02 11:35 UTC (permalink / raw)
  To: Herbert Xu; +Cc: Jan Glauber, Martin Schwidefsky, linux-next

Hi Herbert,

your patch "crypto: shash - Export/import hash state only" causes this
on s390:

  CC      arch/s390/crypto/sha1_s390.o
arch/s390/crypto/sha1_s390.c: In function 'sha1_import':
arch/s390/crypto/sha1_s390.c:63: warning: initialization from incompatible pointer type
arch/s390/crypto/sha1_s390.c: At top level:
arch/s390/crypto/sha1_s390.c:78: warning: initialization from incompatible pointer type
  CC      arch/s390/crypto/sha_common.o
  CC      arch/s390/crypto/sha256_s390.o
arch/s390/crypto/sha256_s390.c: In function 'sha256_import':
arch/s390/crypto/sha256_s390.c:59: warning: initialization from incompatible pointer type
arch/s390/crypto/sha256_s390.c: At top level:
arch/s390/crypto/sha256_s390.c:74: warning: initialization from incompatible pointer type
  CC      arch/s390/crypto/sha512_s390.o
arch/s390/crypto/sha512_s390.c: In function 'sha512_import':
arch/s390/crypto/sha512_s390.c:58: warning: initialization from incompatible pointer type
arch/s390/crypto/sha512_s390.c: At top level:
arch/s390/crypto/sha512_s390.c:76: warning: initialization from incompatible pointer type
arch/s390/crypto/sha512_s390.c:115: warning: initialization from incompatible pointer type

Looks like you missed some conversions. Could you (or Jan?) fix this please?

Thanks!

^ permalink raw reply
* Re: still FTRACE_SYSCALL_MAX compile error on linux-next?
From: Ingo Molnar @ 2009-09-02 13:34 UTC (permalink / raw)
  To: Heiko Carstens
  Cc: Jason Baron, Frederic Weisbecker, linux-next, Martin Schwidefsky
In-Reply-To: <20090902111234.GB4754@osiris.boeblingen.de.ibm.com>


* Heiko Carstens <heiko.carstens@de.ibm.com> wrote:

> On Wed, Sep 02, 2009 at 01:02:31PM +0200, Ingo Molnar wrote:
> > 
> > * Heiko Carstens <heiko.carstens@de.ibm.com> wrote:
> > 
> > > Hi Ingo,
> > > 
> > > in linux-next I still see this compile error on s390:
> > > 
> > > kernel/trace/trace_syscalls.c:13: error: 'FTRACE_SYSCALL_MAX' undeclared here (not in a function)
> > > make[2]: *** [kernel/trace/trace_syscalls.o] Error 1
> > > 
> > > The fix for this in your tracing/core branch:
> > > "tracing: Convert event tracing code to use NR_syscalls"
> > > 
> > > is that branch not part of linux-next?
> > 
> > it is, but it had open bugs so i couldnt push it for some while. 
> > Will push later today most likely.
> 
> Ok, thanks!

pushed it - let me know if there's still trouble in tomorrow's 
linux-next kernel.

	Ingo

^ permalink raw reply
* Re: linux-next / s390 crypto breakage
From: Jan Glauber @ 2009-09-02 17:57 UTC (permalink / raw)
  To: Herbert Xu; +Cc: Martin Schwidefsky, linux-next, Heiko Carstens
In-Reply-To: <20090902113526.GC4754@osiris.boeblingen.de.ibm.com>

That patch should fix the warnings.

--Jan

diff --git a/arch/s390/crypto/sha1_s390.c b/arch/s390/crypto/sha1_s390.c
index 4a94378..f6de782 100644
--- a/arch/s390/crypto/sha1_s390.c
+++ b/arch/s390/crypto/sha1_s390.c
@@ -57,10 +57,10 @@ static int sha1_export(struct shash_desc *desc, void *out)
 	return 0;
 }
 
-static int sha1_import(struct shash_desc *desc, const u8 *in)
+static int sha1_import(struct shash_desc *desc, const void *in)
 {
 	struct s390_sha_ctx *sctx = shash_desc_ctx(desc);
-	struct sha1_state *ictx = in;
+	const struct sha1_state *ictx = in;
 
 	sctx->count = ictx->count;
 	memcpy(sctx->state, ictx->state, sizeof(ictx->state));
diff --git a/arch/s390/crypto/sha256_s390.c b/arch/s390/crypto/sha256_s390.c
index 2bab519..61a7db3 100644
--- a/arch/s390/crypto/sha256_s390.c
+++ b/arch/s390/crypto/sha256_s390.c
@@ -53,10 +53,10 @@ static int sha256_export(struct shash_desc *desc, void *out)
 	return 0;
 }
 
-static int sha256_import(struct shash_desc *desc, const u8 *in)
+static int sha256_import(struct shash_desc *desc, const void *in)
 {
 	struct s390_sha_ctx *sctx = shash_desc_ctx(desc);
-	struct sha256_state *ictx = in;
+	const struct sha256_state *ictx = in;
 
 	sctx->count = ictx->count;
 	memcpy(sctx->state, ictx->state, sizeof(ictx->state));
diff --git a/arch/s390/crypto/sha512_s390.c b/arch/s390/crypto/sha512_s390.c
index b4b3438..4bf73d0 100644
--- a/arch/s390/crypto/sha512_s390.c
+++ b/arch/s390/crypto/sha512_s390.c
@@ -52,10 +52,10 @@ static int sha512_export(struct shash_desc *desc, void *out)
 	return 0;
 }
 
-static int sha512_import(struct shash_desc *desc, const u8 *in)
+static int sha512_import(struct shash_desc *desc, const void *in)
 {
 	struct s390_sha_ctx *sctx = shash_desc_ctx(desc);
-	struct sha512_state *ictx = in;
+	const struct sha512_state *ictx = in;
 
 	if (unlikely(ictx->count[1]))
 		return -ERANGE;


On Wed, 2009-09-02 at 13:35 +0200, Heiko Carstens wrote:
> Hi Herbert,
> 
> your patch "crypto: shash - Export/import hash state only" causes this
> on s390:
> 
>   CC      arch/s390/crypto/sha1_s390.o
> arch/s390/crypto/sha1_s390.c: In function 'sha1_import':
> arch/s390/crypto/sha1_s390.c:63: warning: initialization from incompatible pointer type
> arch/s390/crypto/sha1_s390.c: At top level:
> arch/s390/crypto/sha1_s390.c:78: warning: initialization from incompatible pointer type
>   CC      arch/s390/crypto/sha_common.o
>   CC      arch/s390/crypto/sha256_s390.o
> arch/s390/crypto/sha256_s390.c: In function 'sha256_import':
> arch/s390/crypto/sha256_s390.c:59: warning: initialization from incompatible pointer type
> arch/s390/crypto/sha256_s390.c: At top level:
> arch/s390/crypto/sha256_s390.c:74: warning: initialization from incompatible pointer type
>   CC      arch/s390/crypto/sha512_s390.o
> arch/s390/crypto/sha512_s390.c: In function 'sha512_import':
> arch/s390/crypto/sha512_s390.c:58: warning: initialization from incompatible pointer type
> arch/s390/crypto/sha512_s390.c: At top level:
> arch/s390/crypto/sha512_s390.c:76: warning: initialization from incompatible pointer type
> arch/s390/crypto/sha512_s390.c:115: warning: initialization from incompatible pointer type
> 
> Looks like you missed some conversions. Could you (or Jan?) fix this please?
> 
> Thanks!

^ permalink raw reply related
* Re: linux-next / s390 crypto breakage
From: Herbert Xu @ 2009-09-02 22:04 UTC (permalink / raw)
  To: Jan Glauber; +Cc: Martin Schwidefsky, linux-next, Heiko Carstens
In-Reply-To: <1251914245.7382.6.camel@bender>

On Wed, Sep 02, 2009 at 05:57:25PM +0000, Jan Glauber wrote:
> That patch should fix the warnings.

Thanks, but where is the sign-off :)
-- 
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt

^ permalink raw reply
* Re: linux-next: manual merge of the v4l-dvb tree with Linus' tree
From: Mauro Carvalho Chehab @ 2009-09-03  2:12 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Randy Dunlap
In-Reply-To: <20090902121713.f709b1ce.sfr@canb.auug.org.au>

Em Wed, 2 Sep 2009 12:17:13 +1000
Stephen Rothwell <sfr@canb.auug.org.au> escreveu:

> Hi Mauro,
> 
> Today's linux-next merge of the v4l-dvb tree got a conflict in
> drivers/media/video/gspca/Kconfig between commit
> b6b85048c059e3f085095e48e12ed3f7a92c88d4 ("V4L/DVB (12502): gspca -
> sn9c20x: Fix gscpa sn9c20x build errors") from Linus' tree and commit
> 7b5ab5558fbce09584d8795bc91eb64d8c685782 ("V4L/DVB (12452):
> gspca/Kconfig: Fix bad identation for USB_GSPCA_SN9C20X_EVDEV") from the
> v4l-dvb tree.
> 
> I fixed it up (see below) and will carry the fix for a while.

Thanks.

I've rebased it to fix this merge conflict between my devel tree and upstream.
You probably can drop it on your next merge.



Atenciosamente,
Prof. Mauro Carvalho Chehab, MSc, CISSP
maurochehab@gmail.com

^ permalink raw reply
* linux-next: manual merge of the security-testing tree with the parisc tree
From: Stephen Rothwell @ 2009-09-03  5:46 UTC (permalink / raw)
  To: James Morris
  Cc: linux-next, linux-kernel, David Howells, Kyle McMartin,
	linux-parisc

[-- Attachment #1: Type: text/plain, Size: 903 bytes --]

Hi James,

Today's linux-next merge of the security-testing tree got conflicts in
arch/parisc/include/asm/thread_info.h, arch/parisc/kernel/entry.S and
arch/parisc/kernel/signal.c between commit 9f4259771faf1ffd99888796d925adae4c93630b ("parisc: add TIF_NOTIFY_RESUME and use tracehook_notify_resume") from the parisc tree and
commits d0420c83f39f79afb82010c2d2cafd150eef651b ("KEYS: Extend
TIF_NOTIFY_RESUME to (almost) all architectures [try #6]") and
ee18d64c1f632043a02e6f5ba5e045bb26a5465f ("KEYS: Add a keyctl to install
a process's session keyring on its parent [try #6]") from the
security-testing tree.

Overlapping changes.  I fixed it up (using the parisc versions and adding
the extra change from the latter security-testing patch) and can carry
the fixes as necessary.
-- 
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 security-testing tree with the arm tree
From: Stephen Rothwell @ 2009-09-03  5:47 UTC (permalink / raw)
  To: James Morris
  Cc: linux-next, linux-kernel, Mikael Pettersson, Russell King,
	David Howells

Hi James,

Today's linux-next merge of the security-testing tree got a conflicts in
arch/arm/kernel/signal.c between commit
369842658a36bcea28ecb643ba4bdb53919330dd ("ARM: 5677/1: ARM support for
TIF_RESTORE_SIGMASK/pselect6/ppoll/epoll_pwait") from the arm tree and
commits d0420c83f39f79afb82010c2d2cafd150eef651b ("KEYS: Extend
TIF_NOTIFY_RESUME to (almost) all architectures [try #6]") and
ee18d64c1f632043a02e6f5ba5e045bb26a5465f ("KEYS: Add a keyctl to install
a process's session keyring on its parent [try #6]") from the
security-testing tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/arm/kernel/signal.c
index f7194e4,ea4ad3a..0000000
--- a/arch/arm/kernel/signal.c
+++ b/arch/arm/kernel/signal.c
@@@ -694,5 -706,12 +694,12 @@@ asmlinkage voi
  do_notify_resume(struct pt_regs *regs, unsigned int thread_flags, int syscall)
  {
  	if (thread_flags & _TIF_SIGPENDING)
 -		do_signal(&current->blocked, regs, syscall);
 +		do_signal(regs, syscall);
+ 
+ 	if (thread_flags & _TIF_NOTIFY_RESUME) {
+ 		clear_thread_flag(TIF_NOTIFY_RESUME);
+ 		tracehook_notify_resume(regs);
+ 		if (current->replacement_session_keyring)
+ 			key_replace_session_keyring();
+ 	}
  }

^ permalink raw reply
* linux-next: security-testing tree build failure
From: Stephen Rothwell @ 2009-09-03  5:51 UTC (permalink / raw)
  To: James Morris; +Cc: linux-next, linux-kernel, David Howells

[-- Attachment #1: Type: text/plain, Size: 513 bytes --]

Hi James,

Today's linux-next build (powerpc ppc64_defconfig) failed like this:

kernel/cred.c: In function 'cred_alloc_blank':
kernel/cred.c:234: error: void value not ignored as it ought to be

Caused by commit ee18d64c1f632043a02e6f5ba5e045bb26a5465f ("KEYS: Add a
keyctl to install a process's session keyring on its parent [try #6]").

I have used the version from next-20090902 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
* Re: linux-next: security-testing/net tree build failure
From: David Miller @ 2009-09-03  6:16 UTC (permalink / raw)
  To: sfr; +Cc: jmorris, linux-next, linux-kernel, paul.moore, mst
In-Reply-To: <20090903161432.44af630d.sfr@canb.auug.org.au>

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 3 Sep 2009 16:14:32 +1000

> I applied the following merge fix patch (which I can carry as necessary):

Looks good from here, thanks Stephen.

^ permalink raw reply
* Re: linux-next: manual merge of the v4l-dvb tree with Linus' tree
From: Stephen Rothwell @ 2009-09-03  6:49 UTC (permalink / raw)
  To: Mauro Carvalho Chehab; +Cc: linux-next, linux-kernel, Randy Dunlap
In-Reply-To: <20090902231214.495d4002@pedra.chehab.org>

[-- Attachment #1: Type: text/plain, Size: 354 bytes --]

Hi Mauro,

On Wed, 2 Sep 2009 23:12:14 -0300 Mauro Carvalho Chehab <maurochehab@gmail.com> wrote:
>
> I've rebased it to fix this merge conflict between my devel tree and upstream.
> You probably can drop it on your next merge.

Thanks.

-- 
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: tip tree build warnings
From: Stephen Rothwell @ 2009-09-03  8:25 UTC (permalink / raw)
  To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra
  Cc: linux-next, linux-kernel, Xiao Guangrong

[-- Attachment #1: Type: text/plain, Size: 1039 bytes --]

Hi all,

Today's linux-next build (powerpc ppc64_defconfig) produced these warning:

In file included from include/trace/ftrace.h:285,
                 from include/trace/define_trace.h:61,
                 from include/trace/events/timer.h:342,
                 from kernel/timer.c:50:
include/trace/events/timer.h: In function 'ftrace_raw_output_itimer_state':
include/trace/events/timer.h:280: warning: format '%lu' expects type 'long unsigned int', but argument 4 has type 'cputime_t'
include/trace/events/timer.h: In function 'ftrace_raw_output_itimer_expire':
include/trace/events/timer.h:317: warning: format '%lu' expects type 'long unsigned int', but argument 5 has type 'cputime_t'

Introduced by commit 3f0a525ebf4b8ef041a332bbe4a73aee94bb064b ("timers: Add tracepoints for itimer") from the tip tree.

cputime_t is variously "u64", "unsigned long long" and "unsigned long" on
different architectures.

-- 
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 tip tree with the rr tree
From: Stephen Rothwell @ 2009-09-03  8:25 UTC (permalink / raw)
  To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra
  Cc: linux-next, linux-kernel, Rusty Russell

Hi all,

Today's linux-next merge of the tip tree got a conflict in
arch/x86/kernel/setup.c between commit
212eddcdef19bfbe9c2178257708eb7cf17931be
("cpumask:remove-last-remaining-irqaction-mask") from the rr tree and
commit 845b3944bbdf9e9247849bf037f27ff3a3f26d87 ("x86: Add timer_init to
x86_init_ops") from the tip tree.

The latter moves the code that the former removes.  I fixed it up using
the following patch (which I can carry as necessary).

From: Stephen Rothwell <sfr@canb.auug.org.au>
Subject: tip: fix merge for cupmask update

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

diff --git a/arch/x86/kernel/time.c b/arch/x86/kernel/time.c
index fcece00..7883cf9 100644
--- a/arch/x86/kernel/time.c
+++ b/arch/x86/kernel/time.c
@@ -93,7 +93,6 @@ static struct irqaction irq0  = {
 
 void __init setup_default_timer_irq(void)
 {
-	irq0.mask = cpumask_of_cpu(0);
 	setup_irq(0, &irq0);
 }
 

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

^ permalink raw reply related
* Re: linux-next: tip tree build warnings
From: Ingo Molnar @ 2009-09-03  8:38 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Thomas Gleixner, H. Peter Anvin, Peter Zijlstra, linux-next,
	linux-kernel, Xiao Guangrong
In-Reply-To: <20090903182510.8fd4d4d1.sfr@canb.auug.org.au>


* Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi all,
> 
> Today's linux-next build (powerpc ppc64_defconfig) produced these warning:
> 
> In file included from include/trace/ftrace.h:285,
>                  from include/trace/define_trace.h:61,
>                  from include/trace/events/timer.h:342,
>                  from kernel/timer.c:50:
> include/trace/events/timer.h: In function 'ftrace_raw_output_itimer_state':
> include/trace/events/timer.h:280: warning: format '%lu' expects type 'long unsigned int', but argument 4 has type 'cputime_t'
> include/trace/events/timer.h: In function 'ftrace_raw_output_itimer_expire':
> include/trace/events/timer.h:317: warning: format '%lu' expects type 'long unsigned int', but argument 5 has type 'cputime_t'

Should be harmless with no runtime effects - the fix would be to 
harmonize the cputime_t types across architectures.

> Introduced by commit 3f0a525ebf4b8ef041a332bbe4a73aee94bb064b ("timers: Add tracepoints for itimer") from the tip tree.
> 
> cputime_t is variously "u64", "unsigned long long" and "unsigned 
> long" on different architectures.

Should be unsigned long i think. Most architectures use it as 
unsigned long via include/asm-generic/cputime.h, except these three:

 arch/ia64/include/asm/cputime.h:typedef u64 cputime_t;
 arch/powerpc/include/asm/cputime.h:typedef u64 cputime_t;
 arch/s390/include/asm/cputime.h:typedef unsigned long long cputime_t;

Or we could eliminate the type altogether as well and standardize on 
u64. Thomas?

	Ingo

^ permalink raw reply
* linux-next: manual merge of the percpu tree with the tip tree
From: Stephen Rothwell @ 2009-09-03  9:11 UTC (permalink / raw)
  To: Tejun Heo, Rusty Russell, Christoph Lameter, Ingo Molnar
  Cc: linux-next, linux-kernel, Anirban Sinha, Thomas Gleixner,
	H. Peter Anvin, Peter Zijlstra

Hi all,

Today's linux-next merge of the percpu tree got a conflict in
kernel/sched.c between commit 84e9dabf6e6a78928c6a1a8ba235c9fb0908d0f8
("sched: Rename init_cfs_rq => init_tg_cfs_rq") from the tip tree and
commit b9bf3121af348d9255f1c917830fe8c2df52efcb ("percpu: use
DEFINE_PER_CPU_SHARED_ALIGNED()") from the percpu tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc kernel/sched.c
index 4061929,d3d7e76..0000000
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@@ -318,7 -318,7 +318,7 @@@ struct task_group root_task_group
  /* Default task group's sched entity on each cpu */
  static DEFINE_PER_CPU(struct sched_entity, init_sched_entity);
  /* Default task group's cfs_rq on each cpu */
- static DEFINE_PER_CPU(struct cfs_rq, init_tg_cfs_rq) ____cacheline_aligned_in_smp;
 -static DEFINE_PER_CPU_SHARED_ALIGNED(struct cfs_rq, init_cfs_rq);
++static DEFINE_PER_CPU_SHARED_ALIGNED(struct cfs_rq, init_tg_cfs_rq);
  #endif /* CONFIG_FAIR_GROUP_SCHED */
  
  #ifdef CONFIG_RT_GROUP_SCHED

^ permalink raw reply
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox