linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: mad_soft@inbox.ru (Dmitry Artamonow)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 00/20] iPAQ h3100/h3600 work for 2.6.33
Date: Wed, 25 Nov 2009 00:25:41 +0300	[thread overview]
Message-ID: <20091124212541.GA5751@rainbow> (raw)
In-Reply-To: <20091123203931.GI18142@n2100.arm.linux.org.uk>

On 20:39 Mon 23 Nov     , Russell King - ARM Linux wrote:
> > I'm thinking about submitting full patchset into you patchsystem soon,
> > but I'd like to know that everything is ok before doing that.
> 
> Well, I'm not sure what Thomas Kunze is doing, I've not heard from him in
> a while.
> 
> How do your patches affect his?  Are your patches a superset of Thomas's
> patches?  If not, should Thomas's be merged first?

Mine and Thomas patchsets are pretty independent - not even a file in
common, and they don't depend on each other even indirectly.

But mine depends on changes in your 'sa1100' branch, and I've been slightly
worrying about this commit:  "ARM: sa11x0: convert set_xxx_data() to
register_xxx()", which touches collie.c. Though, looks like it doesn't
conflict with Thomas's patches in fact (I've made a test 'git merge' just
to be sure).

Oh, and forgot to mention - your 'sa1100' branch is currently based on
2.6.32-rc3, you'll need to rebase it on more current -rc before applying
my patches, because of 4918a0139 (ARM: 5752/1: SA1100: fix building of
h3100), which went in -rc4.

-- 
Best regards,
Dmitry "MAD" Artamonow

  reply	other threads:[~2009-11-24 21:25 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-10-24 20:03 [PATCH 00/20] iPAQ h3100/h3600 work for 2.6.33 Dmitry Artamonow
2009-10-24 20:03 ` [PATCH 01/20] SA1100: h3100/h3600: mark *_mach_init functions as __init Dmitry Artamonow
2009-10-24 20:04   ` [PATCH 02/20] SA1100: h3100/h3600: remove dead links from Kconfig help text Dmitry Artamonow
2009-10-24 20:04     ` [PATCH 03/20] SA1100: h3600: remove IRDA bits from serial PM callback Dmitry Artamonow
2009-10-24 20:04       ` [PATCH 04/20] SA1100: h3600: remove unused cruft from h3600.h Dmitry Artamonow
2009-10-24 20:04         ` [PATCH 05/20] SA1100: h3600: stop setting direction for LCD pins Dmitry Artamonow
2009-10-24 20:04           ` [PATCH 06/20] pcmcia: convert sa1100_h3600 driver to gpiolib Dmitry Artamonow
2009-10-24 20:08             ` [PATCH 07/20] SA1100: h3100/h3600: separate machine-specific LCD helpers Dmitry Artamonow
2009-10-24 20:08               ` [PATCH 08/20] SA1100: h3100/h3600: add htc-egpio driver Dmitry Artamonow
2009-10-24 20:12                 ` [PATCH 09/20] SA1100: h3100/h3600: convert all users of assign_h3600_egpio to gpiolib Dmitry Artamonow
2009-10-24 20:14                   ` [PATCH 10/20] SA1100: h3100/h3600: remove now unused assign_h3600_egpio handlers Dmitry Artamonow
2009-10-24 20:14                     ` [PATCH 11/20] SA1100: h3600: remove IRQ_GPIO_* definitions Dmitry Artamonow
2009-10-24 20:16                       ` [PATCH 12/20] SA1100: h3100/h3600: configure all unused gpios as inputs Dmitry Artamonow
2009-10-24 20:20                         ` [PATCH 13/20] SA1100: h3100/h3600: drop old GPIO definitions Dmitry Artamonow
2009-10-24 20:20                           ` [PATCH 14/20] SA1100: h3100/h3600: merge h3600.h and h3600_gpio.h into h3xxx.h Dmitry Artamonow
2009-10-24 20:23                             ` [PATCH 15/20] SA1100: h3100/h3600: split h3600.c Dmitry Artamonow
2009-10-24 20:26                               ` [PATCH 16/20] SA1100: h3100/h3600: revise copyright boilerplates Dmitry Artamonow
2009-10-24 20:30                                 ` [PATCH 17/20] SA1100: h3100/h3600: clean up #includes Dmitry Artamonow
2009-10-24 20:30                                   ` [PATCH 18/20] SA1100: h3100/h3600: add support for gpio-keys Dmitry Artamonow
2009-10-24 20:37                                     ` [PATCH 19/20] SA1100: reuse h3600 PCMCIA driver on h3100 Dmitry Artamonow
2009-10-24 20:37                                       ` [PATCH 20/20] SA1100: h3600: update defconfig Dmitry Artamonow
2009-10-24 21:10 ` [PATCH 00/20] iPAQ h3100/h3600 work for 2.6.33 Russell King - ARM Linux
2009-10-25 15:36   ` Dmitry Artamonow
2009-11-15 17:30     ` Dmitry Artamonow
2009-11-23 20:39       ` Russell King - ARM Linux
2009-11-24 21:25         ` Dmitry Artamonow [this message]
2009-11-25 16:53           ` Russell King - ARM Linux
2009-11-25 17:48             ` Thomas Kunze
2009-11-25 22:11               ` Russell King - ARM Linux
2009-11-27 20:44                 ` Thomas Kunze
2009-11-27 22:04                   ` Russell King - ARM Linux
2009-11-28 12:02                     ` Thomas Kunze

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=20091124212541.GA5751@rainbow \
    --to=mad_soft@inbox.ru \
    --cc=linux-arm-kernel@lists.infradead.org \
    /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).