From: Greg KH <gregkh@suse.de>
To: H Hartley Sweeten <hartleys@visionengravers.com>
Cc: Greg KH <greg@kroah.com>,
"devel@driverdev.osuosl.org" <devel@driverdev.osuosl.org>,
"ss@aao.gov.au" <ss@aao.gov.au>,
Linux Kernel <linux-kernel@vger.kernel.org>
Subject: Re: Staging: dt3155: Cleanup memory mapped i/o access
Date: Mon, 3 May 2010 16:40:13 -0700 [thread overview]
Message-ID: <20100503234013.GB13519@suse.de> (raw)
In-Reply-To: <0D753D10438DA54287A00B0270842697636EADE26A@AUSP01VMBX24.collaborationhost.net>
On Mon, May 03, 2010 at 06:33:08PM -0500, H Hartley Sweeten wrote:
> On Monday, May 03, 2010 3:45 PM, H Hartley Sweeten wrote:
> >>> Could the next tree be out of sync with your tree?
> >>
> >> Hm, some other tree might be doing something in those files. But the
> >> fact that the drivers/staging/dt3155/dt3155_io.h was so wrong it thought
> >> it was a revert, makes me suspect that you did it against something
> >> else.
> >>
> >> If you make this against my staging-next tree at
> >> git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-next-2.6.git
> >> Using the staging-next branch, does that make the patch different?
> >
> > Ok. Pulled your staging-next (thanks Joe).
> >
> > It's way different from linux-next and matches Linus' tree exactly. It's
> > missing all of your "Drop the "_s"..." and "The typedef is not needed."
> > patches.
> >
> > Of course I could be on the wrong branch for your staging-next tree. The
> > only branches listed are:
> >
> > $ git branch -a
> > * master
> > remotes/origin/HEAD -> origin/master
> > remotes/origin/master
>
> It appears these are the patches missing in your staging-next tree that do
> exist in the linux-next tree:
>
> Staging: dt3155: remove "inline" usage
> Staging: dt3155: rename dt3155_fbuffer_s
> Staging: dt3155: rename dt3155_config_s
> Staging: dt3155: rename dt3155_read_t
> Staging: dt3155: rename dt3155_status_t
> Staging: dt3155: remove frame_info_t
> Staging: dt3155: remove TRUE/FALSE
> Staging: dt3155: remove #ifdef
> Staging: dt3155: allocator.c: sparse cleanups
> Staging: dt3155: fix parentheses and bracket spacing style issues
> Staging: dt3155: fix coding style issue in dt3155_isr.c
> Staging: dt3155: fix wait_ibsyclr function
> Staging: remove unused #include <linux/version.h>
Odd, what branch did they come from?
> The first one that exists in both is:
>
> Staging: dt3155: fix 50Hz configuration
>
> Could the others be in a staging-stable branch?
I do not know, they don't look to be something I've seen.
thanks,
greg k-h
next prev parent reply other threads:[~2010-05-03 23:41 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-04-28 17:23 [PATCH] Staging: dt3155: Cleanup memory mapped i/o access H Hartley Sweeten
2010-04-30 21:56 ` Greg KH
2010-05-02 17:35 ` H Hartley Sweeten
2010-05-02 18:00 ` H Hartley Sweeten
2010-05-03 18:59 ` Greg KH
2010-05-03 20:15 ` H Hartley Sweeten
2010-05-03 21:17 ` Greg KH
2010-05-03 22:24 ` H Hartley Sweeten
2010-05-03 22:45 ` H Hartley Sweeten
2010-05-03 23:33 ` H Hartley Sweeten
2010-05-03 23:40 ` Greg KH [this message]
2010-05-03 23:41 ` Greg KH
2010-05-03 23:59 ` Joe Perches
2010-05-04 2:54 ` Greg KH
2010-05-04 19:07 ` Joe Perches
2010-05-04 20:02 ` H Hartley Sweeten
2010-05-04 20:12 ` Greg KH
2010-05-04 20:53 ` H Hartley Sweeten
2010-05-04 21:02 ` Greg KH
2010-05-04 21:22 ` H Hartley Sweeten
2010-05-06 16:59 ` H Hartley Sweeten
2010-05-06 20:25 ` Greg KH
2010-06-21 15:51 ` [PATCH v2] " H Hartley Sweeten
2010-06-22 22:39 ` Greg KH
2010-06-22 22:45 ` H Hartley Sweeten
2010-06-22 23:04 ` Greg KH
2010-06-22 23:36 ` H Hartley Sweeten
2010-05-04 0:49 ` H Hartley Sweeten
-- strict thread matches above, loose matches on Subject: below --
2010-06-22 23:38 [PATCH v2] " H Hartley Sweeten
2010-06-23 22:23 ` Greg KH
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=20100503234013.GB13519@suse.de \
--to=gregkh@suse.de \
--cc=devel@driverdev.osuosl.org \
--cc=greg@kroah.com \
--cc=hartleys@visionengravers.com \
--cc=linux-kernel@vger.kernel.org \
--cc=ss@aao.gov.au \
/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