linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Alexandre Courbot <gnurou@gmail.com>
To: Grant Likely <grant.likely@secretlab.ca>,
	Stephen Rothwell <sfr@canb.auug.org.au>,
	Chen Baozi <baozich@gmail.com>
Cc: Linus Walleij <linus.walleij@linaro.org>,
	Arnd Bergmann <arnd@arndb.de>,
	"linux-arch@vger.kernel.org" <linux-arch@vger.kernel.org>,
	Alexandre Courbot <acourbot@nvidia.com>,
	linux-next <linux-next@vger.kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH v2 0/4] remove GENERIC_GPIO
Date: Tue, 16 Apr 2013 15:11:41 -0700	[thread overview]
Message-ID: <CAAVeFuJ1iVZ24iU7yKSdjn_KSHThpYQFG0ccxS4Z0Qqg04v-tg@mail.gmail.com> (raw)
In-Reply-To: <CACxGe6ukQ7eys9-m_hgpscy9tTncPd1CL0O+n0sBZA-o0AbwdA@mail.gmail.com>

Hi Grant, Stephen,

On Tue, Apr 16, 2013 at 2:45 AM, Grant Likely <grant.likely@secretlab.ca> wrote:
>>> Grant, if this is ok with you, how shall we have this integrated into your
>>> branch? Half of this has been tested in my -next branch, and the present patches
>>> make the next half, should I resend you the whole series based on -next and
>>> withdraw my branch? This is a fast moving target, so we should try and shoot
>>> that duck as soon as we can! :)
>>
>> Most of your patches are already in linux-next in a separate branch, so
>> the first thing to do is get these remaining patches into that same
>> branch. As we discussed on IRC, you need to move yor current
>> "remove_generic_gpio" branch into your for_next branch so that it is
>> picked up by Stephen. There isn't any functional change there, but it
>> means that your series will be based on a defined point of Linus' tree
>> (v3.9-rc6) instead of an arbitrary commit point between -rc3 and -rc4.
>
> On second thought, no don't do this. Just leave it as is. It is more
> important to retain the test coverage you've already had in linux-next
> on these commits. Just apply the patches I've acked onto your existing
> for_next branch.

Ok, so I have added the 3 acked patches to the top of my for_next
branch and they will be pulled by Stephen for the next -next
iteration. I have also tried to merge the branch by myself into
today's next, and have been relieved to see that conflicts were
actually minimal (thanks to not including the GPIOLIB -> GPIO renaming
patch - definitely a good idea). Here is some information about how
the branch should look after merging:

"git grep CONFIG_GENERIC_GPIO" should return 0 hits whereas "git grep
'\bGENERIC_GPIO\b'" should return only one hit, in
Documentation/zh_CN/gpio.txt (Chen, I'm not sure if you intended to
leave this one in your documentation update patch?). Remaining
selectors or dependencies on GENERIC_GPIO should be turned into
GPIOLIB. Also the arc/ architecture defines GENERIC_GPIO once more,
this definition can be deleted.

There were only 3 or 4 conflicts to address on today's -next, and then
the kernel compiles just fine on the architectures I tried.

Thanks!
Alex.

           reply	other threads:[~2013-04-16 22:12 UTC|newest]

Thread overview: expand[flat|nested]  mbox.gz  Atom feed
 [parent not found: <CACxGe6ukQ7eys9-m_hgpscy9tTncPd1CL0O+n0sBZA-o0AbwdA@mail.gmail.com>]

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=CAAVeFuJ1iVZ24iU7yKSdjn_KSHThpYQFG0ccxS4Z0Qqg04v-tg@mail.gmail.com \
    --to=gnurou@gmail.com \
    --cc=acourbot@nvidia.com \
    --cc=arnd@arndb.de \
    --cc=baozich@gmail.com \
    --cc=grant.likely@secretlab.ca \
    --cc=linus.walleij@linaro.org \
    --cc=linux-arch@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=sfr@canb.auug.org.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;
as well as URLs for NNTP newsgroup(s).