public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Greg KH <greg@kroah.com>
To: mchehab@infradead.org
Cc: linux-dvb-maintainer@linuxtv.org, video4linux-list@redhat.com,
	akpm@osdl.org, linux-kernel@vger.kernel.org, torvalds@osdl.org
Subject: Re: [PATCH 00/14] V4L/DVB updates
Date: Tue, 8 Aug 2006 14:22:44 -0700	[thread overview]
Message-ID: <20060808212244.GA18650@kroah.com> (raw)
In-Reply-To: <20060808210151.PS78629800000@infradead.org>

On Tue, Aug 08, 2006 at 06:01:51PM -0300, mchehab@infradead.org wrote:
> ---
> 
>  drivers/media/dvb/bt8xx/dst.c                      |   58 -
>  drivers/media/dvb/dvb-core/Makefile                |    6 
>  drivers/media/radio/Kconfig                        |   12 
>  drivers/media/radio/Makefile                       |    1 
>  drivers/media/radio/dsbr100.c                      |  430 +++++++++++++
>  drivers/media/video/Kconfig                        |   12 
>  drivers/media/video/Makefile                       |    2 
>  drivers/media/video/compat_ioctl32.c               |   32 
>  drivers/media/video/cx25840/cx25840-core.c         |    4 
>  drivers/media/video/cx88/cx88-video.c              |    4 
>  drivers/media/video/dsbr100.c                      |  430 -------------
>  drivers/media/video/msp3400-kthreads.c             |    4 
>  drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c |    2 
>  driverg/media/video/pwc/Kconfig                    |    2 
>  drivers/media/video/pwc/pwc-if.c                   |    1 
>  drivers/media/video/saa7134/saa7134-video.c        |    2 
>  drivers/media/video/tuner-types.c                  |   14 
>  drivers/media/video/v4l1-compat.c                  |    4 
>  drivers/media/video/v4l2-common.c                  |    6 
>  drivers/media/video/videodev.c                     |    2 
>  drivers/media/video/vivi.c                         |    4 
>  include/media/v4l2-dev.h                           |    2 
>  sound/oss/Kconfig                                  |    6 
>  sound/pci/Kconfig                                  |   70 +-
>  24 files changed, 569 insertions(+), 541 deletions(-)

In the future (I know Linus has asked me to do this, and it makes
sense), can you generate the diffstat with:
	git diff -M --stat --summary
so that it shows the renames instead?  That way when I (or Linus) pulls,
it shows the same thing to me, that you show here.  As an example, when
I pulled this I got the following:

Merge ad552692a4489917fa4b71f9c6a91baae4aee799, made by recursive.
 drivers/media/dvb/bt8xx/dst.c               |   58 ++++++++++------------
 drivers/media/dvb/dvb-core/Makefile         |    6 +-
 drivers/media/radio/Kconfig                 |   12 ++++-
 drivers/media/radio/Makefile                |    1 
 drivers/media/{video => radio}/dsbr100.c    |    0 
 drivers/media/video/Kconfig                 |   12 -----
 drivers/media/video/Makefile                |    2 -
 drivers/media/video/compat_ioctl32.c        |   32 +++++++++++-
 drivers/media/video/cx25840/cx25840-core.c  |    4 +-
 drivers/media/video/cx88/cx88-video.c       |    4 +-
 drivers/media/video/msp3400-kthreads.c      |    4 +-
 drivers/media/video/pwc/Kconfig             |    2 -
 drivers/media/video/pwc/pwc-if.c            |    1 
 drivers/media/video/saa7134/saa7134-video.c |    2 -
 drivers/media/video/tuner-types.c           |   14 +++--
 drivers/media/video/v4l1-compat.c           |    4 ++
 drivers/media/video/v4l2-common.c           |    6 +-
 drivers/media/video/videodev.c              |    2 -
 drivers/media/video/vivi.c                  |    4 +-
 include/media/v4l2-dev.h                    |    2 -
 sound/oss/Kconfig                           |    6 +-
 sound/pci/Kconfig                           |   70 ++++++++++++++-------------
 22 files changed, 138 insertions(+), 110 deletions(-)
 rename drivers/media/{video/dsbr100.c => radio/dsbr100.c} (100%)

Which I'm pretty sure is the same as what you ment me to pull.

thanks,

greg k-h

      parent reply	other threads:[~2006-08-08 21:23 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-08-08 21:01 [PATCH 00/14] V4L/DVB updates mchehab
2006-08-08 21:06 ` [PATCH 02/14] V4L/DVB (4371a): Fix V4L1 dependencies on compat_ioctl32 mchehab
2006-08-08 21:06 ` [PATCH 01/14] V4L/DVB (4340): Videodev.h should be included also when V4L1_COMPAT is selected mchehab
2006-08-08 21:06 ` [PATCH 07/14] V4L/DVB (4411): Fix minor errors in build files mchehab
2006-08-08 21:06 ` [PATCH 06/14] V4L/DVB (4407): Driver dsbr100 is a radio device, not a video one! mchehab
2006-08-08 21:06 ` [PATCH 05/14] V4L/DVB (4399): Fix a typo that caused some compat stuff to not work mchehab
2006-08-08 21:06 ` [PATCH 04/14] V4L/DVB (4395): Restore compat_ioctl in pwc driver mchehab
2006-08-08 21:06 ` [PATCH 08/14] V4L/DVB (4416): Cx25840_read4 has wrong endianness mchehab
2006-08-08 21:06 ` [PATCH 03/14] V4L/DVB (4371b): Fix V4L1 dependencies at drivers under sound/oss and sound/pci mchehab
2006-08-08 21:54   ` Lee Revell
2006-08-09 12:32     ` Mauro Carvalho Chehab
2006-08-08 21:06 ` [PATCH 10/14] V4L/DVB (4419): Turn on the Low Noise Amplifier of the Samsung tuners mchehab
2006-08-08 21:06 ` [PATCH 09/14] V4L/DVB (4418): Fix broken msp3400 module option 'standard' mchehab
2006-08-08 21:06 ` [PATCH 11/14] V4L/DVB (4427): Fix V4L1 Compat for VIDIOCGPICT ioctl mchehab
2006-08-08 21:06 ` [PATCH 13/14] V4L/DVB (4431): Add several error checks to dst mchehab
2006-08-08 21:06 ` [PATCH 12/14] V4L/DVB (4430): Quickcam_messenger compilation fix mchehab
2006-08-09  0:19   ` Diego Calleja
2006-08-08 21:06 ` [PATCH 14/14] V4L/DVB (4485): Fix a warning on PPC64 mchehab
2006-08-08 21:22 ` Greg KH [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20060808212244.GA18650@kroah.com \
    --to=greg@kroah.com \
    --cc=akpm@osdl.org \
    --cc=linux-dvb-maintainer@linuxtv.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mchehab@infradead.org \
    --cc=torvalds@osdl.org \
    --cc=video4linux-list@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox