headers
Stephen Rothwell | 1 Sep 2008 05:14
Picon
Picon

linux-next: manual merge of the v4l-dvb tree

Hi Mauro,

Today's linux-next merge of the v4l-dvb tree got a conflict in
drivers/media/radio/dsbr100.c between commit
59d1f04f76c8386d468f74c18fe5c008752c9340 ("USB: remove warn() macro from
usb.h") from the usb tree and commit
63057954eb49549963c4c5079381492575cab33a ("V4L/DVB (8778): radio: fix
incorrect video_register_device result check") from the v4l-dvb tree.

Just a context clash.  I fixed it up (see below) and can carry the fix.
-- 
Cheers,
Stephen Rothwell                    sfr <at> canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

diff --cc drivers/media/radio/dsbr100.c
index d8e3857,0f06e6f..0000000
--- a/drivers/media/radio/dsbr100.c
+++ b/drivers/media/radio/dsbr100.c
 <at>  <at>  <at>  -413,9 -412,9 +414,10  <at>  <at>  <at>  static int usb_dsbr100_open(struct inod
  	radio->muted = 1;

  	if (dsbr100_start(radio)<0) {
 -		warn("Radio did not start up properly");
 +		dev_warn(&radio->usbdev->dev,
 +			 "Radio did not start up properly\n");
  		radio->users = 0;
+ 		unlock_kernel();
  		return -EIO;
  	}
(Continue reading)

Permalink | Reply | 2 comments |
headers
Stephen Rothwell | 1 Sep 2008 05:22
Picon
Picon

linux-next: manual merge of the v4l-dvb tree

Hi Mauro,

Today's linux-next merge of the v4l-dvb tree got a conflict in
drivers/media/video/zr364xx.c between commit
4f1ddb5e3580439b0168e1ad14b8328ec926768f ("USB: remove info() macro from
usb.h") from the usb tree and commit
1527ad8b9b0ecacb5d06c309e26a688359ef2919 ("V4L/DVB (8731): zr364xx:
remove BKL") from the v4l-dvb tree.

Just overlapping context.  I have fixed it up (see below) and can carry
the fix.  This is, of course, also fixable in the v4l-dvb tree.

--

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

diff --cc drivers/media/video/zr364xx.c
index 5eb8cb8,93991cb..0000000
--- a/drivers/media/video/zr364xx.c
+++ b/drivers/media/video/zr364xx.c
 <at>  <at>  <at>  -651,8 -652,9 +653,9  <at>  <at>  <at>  static int zr364xx_open(struct inode *i
  	if (!cam->framebuf) {
  		cam->framebuf = vmalloc_32(MAX_FRAME_SIZE * FRAMES);
  		if (!cam->framebuf) {
 -			info("vmalloc_32 failed!");
 +			dev_err(&cam->udev->dev, "vmalloc_32 failed!\n");
- 			return -ENOMEM;
+ 			err = -ENOMEM;
+ 			goto out;
(Continue reading)

Permalink | Reply | 0 comments |
headers
Stephen Rothwell | 1 Sep 2008 05:42
Picon
Picon

Re: linux-next: manual merge of the v4l-dvb tree

Hi Mauro,

On Mon, 1 Sep 2008 13:14:58 +1000 Stephen Rothwell <sfr <at> canb.auug.org.au> wrote:
>
> Today's linux-next merge of the v4l-dvb tree got a conflict in
> drivers/media/radio/dsbr100.c between commit
> 59d1f04f76c8386d468f74c18fe5c008752c9340 ("USB: remove warn() macro from
> usb.h") from the usb tree and commit
> 63057954eb49549963c4c5079381492575cab33a ("V4L/DVB (8778): radio: fix
> incorrect video_register_device result check") from the v4l-dvb tree.
> 
> Just a context clash.  I fixed it up (see below) and can carry the fix.

Of course, this is fixable in the v4l-dvb tree as well.

--

-- 
Cheers,
Stephen Rothwell                    sfr <at> canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
Permalink | Reply | 1 comment |
headers
Stephen Rothwell | 1 Sep 2008 06:20
Picon
Picon

linux-next: manual merge of the sound tree

Hi Takashi,

Today's linux-next merge of the sound tree got a conflict in sound/core/memalloc.c between commit
759ee81be6d87c150ea2b300c221b4fec8b5f646 ("alsa: Remove special SBUS dma support code.") from the
sparc tree and commit d3acb92557b99feb051ac173d119d06900c364f5 ("ALSA: Kill snd_assert() in
sound/core/*") from the sound tree.

The former removes code modified by the latter.  I just removed the
code.  I will carry the fixup.
--

-- 
Cheers,
Stephen Rothwell                    sfr <at> canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
Permalink | Reply | 7 comments |
headers
David Miller | 1 Sep 2008 06:36
Favicon

Re: linux-next: manual merge of the sound tree

From: Stephen Rothwell <sfr <at> canb.auug.org.au>
Date: Mon, 1 Sep 2008 14:20:30 +1000

> Today's linux-next merge of the sound tree got a conflict in
> sound/core/memalloc.c between commit
> 759ee81be6d87c150ea2b300c221b4fec8b5f646 ("alsa: Remove special SBUS
> dma support code.") from the sparc tree and commit
> d3acb92557b99feb051ac173d119d06900c364f5 ("ALSA: Kill snd_assert()
> in sound/core/*") from the sound tree.
> 
> The former removes code modified by the latter.  I just removed the
> code.  I will carry the fixup.

Thanks Stephen.

Takashi-san, FYI, in the Sparc tree we have removed all SBUS specific
BUS probing and device code, all drivers are now generic and use plain
linux/dma-mapping.h interfaces.

So the sound layer SBUS code was superfluous and unused, so we
deleted it.
Permalink | Reply | 6 comments |
headers
Takashi Iwai | 1 Sep 2008 07:53
Picon

Re: linux-next: manual merge of the sound tree

At Sun, 31 Aug 2008 21:36:07 -0700 (PDT),
David Miller wrote:
> 
> From: Stephen Rothwell <sfr <at> canb.auug.org.au>
> Date: Mon, 1 Sep 2008 14:20:30 +1000
> 
> > Today's linux-next merge of the sound tree got a conflict in
> > sound/core/memalloc.c between commit
> > 759ee81be6d87c150ea2b300c221b4fec8b5f646 ("alsa: Remove special SBUS
> > dma support code.") from the sparc tree and commit
> > d3acb92557b99feb051ac173d119d06900c364f5 ("ALSA: Kill snd_assert()
> > in sound/core/*") from the sound tree.
> > 
> > The former removes code modified by the latter.  I just removed the
> > code.  I will carry the fixup.
> 
> Thanks Stephen.
> 
> Takashi-san, FYI, in the Sparc tree we have removed all SBUS specific
> BUS probing and device code, all drivers are now generic and use plain
> linux/dma-mapping.h interfaces.
> 
> So the sound layer SBUS code was superfluous and unused, so we
> deleted it.

Thanks David, that's a good clean up (but a bad timing for me ;-)

Where can I find this change?  I now looked at
  git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6.git
but it has no such a commit
(Continue reading)

Permalink | Reply | 5 comments |
headers
Stephen Rothwell | 1 Sep 2008 08:19
Picon
Picon

linux-next: manual merge of the firmware tree

Hi David,

Today's linux-next merge of the firmware tree got a conflict in
drivers/scsi/qlogicpti.c between commits
738f2b7b813913e651f39387d007dd961755dee2 ("sparc: Convert all SBUS
drivers to dma_*() interfaces") and
5dc2536bb8d8adb5fdfbe76cd6fdcdf9de3f40f8 ("qlogicpti: Convert to pure OF
driver") from the sparc tree and commit
229d9a03273684dc2175821be4104dbaa52f3ce0 ("qlogicpti: use
request_firmware") from the firmware tree.

Just simple clashes. I fixed it up (see below) and can carry the fixup.
--

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

diff --cc drivers/scsi/qlogicpti.c
index 4280767,1b6594e..0000000
--- a/drivers/scsi/qlogicpti.c
+++ b/drivers/scsi/qlogicpti.c
 <at>  <at>  <at>  -25,9 -25,7 +25,10  <at>  <at>  <at> 
  #include <linux/interrupt.h>
  #include <linux/module.h>
  #include <linux/jiffies.h>
 +#include <linux/dma-mapping.h>
 +#include <linux/of.h>
 +#include <linux/of_device.h>
+ #include <linux/firmware.h>
(Continue reading)

Permalink | Reply | 0 comments |
headers
Stephen Rothwell | 1 Sep 2008 10:26
Picon
Picon

linux-next: revert of "debug: add notifier chain debugging"

Hi all,

I have reverted commit 16f9b13de93c8bfdac16b4d15577af2c132358ef ("debug:
add notifier chain debugging") for today hate typing thas it prevents Powerpc kernels
from booting.  There is (I think) a bug there (__devinit routines are not
put in the right section as pointed otu by David Woodhouse), but not a
fatal bug and the above commit makes it one.

Ingo, Arjan sent you a new version of this patch on Aug 27.

I will have a go at fixing the powerpc bug tomorrow.
--

-- 
Cheers,
Stephen Rothwell                    sfr <at> canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
Permalink | Reply | 4 comments |
headers
David Miller | 1 Sep 2008 10:28
Favicon

Re: linux-next: manual merge of the sound tree

From: Takashi Iwai <tiwai <at> suse.de>
Date: Mon, 01 Sep 2008 07:53:31 +0200

> Where can I find this change?  I now looked at
>   git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6.git
> but it has no such a commit

sparc-next-2.6.git is where "-next" changes for Sparc live :)

> I can either remove the affecting chunk in my patch, or merge your
> patch first to my tree and rebase.

The other option is for Stephen to just keep fixing the merge,
if we just do nothing his way of doing this is automated.
Permalink | Reply | 4 comments |
headers
Takashi Iwai | 1 Sep 2008 10:34
Picon

Re: linux-next: manual merge of the sound tree

At Mon, 01 Sep 2008 01:28:27 -0700 (PDT),
David Miller wrote:
> 
> > Where can I find this change?  I now looked at
> >   git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6.git
> > but it has no such a commit
> 
> sparc-next-2.6.git is where "-next" changes for Sparc live :)

Ah, that obvious one.  Thanks.

> > I can either remove the affecting chunk in my patch, or merge your
> > patch first to my tree and rebase.
> 
> The other option is for Stephen to just keep fixing the merge,
> if we just do nothing his way of doing this is automated.

That's fine for me, too.
But, I guess we'd need to fix the conflict anyway when 2.6.28 merge
window is opened.

Takashi
Permalink | Reply | 3 comments |

Gmane