merging PCMCIA changes

[Andrew Morton]

Dominik Brodowski <linux at dominikbrodowski.net> wrote:
>
> Hi!
> 
> With 2.6.12 being out the door, I think the time is ready for the big pile
> of PCMCIA changes waiting in -mm. These are:
> 
> pci-pci-transparent-bridge-handling-improvements-yenta_socket.patch
> ...
> pcmcia-properly-handle-all-errors-of-register_chrdev.patch
> 
> In addition, five quite trivial patches I sent to Andrew a few minutes ago
> might also be suitable to go into Linus' latest immediately. These were
> titeled:
> 
> [PATCH 1/5] pcmcia: more IDs for TDK multifunction cards
> [PATCH 2/5] pcmcia: 8 and 16 bit access for static_map
> [PATCH 3/5] pcmcia: sl811 update
> [PATCH 4/5] pcmcia: more IDs for ide_cs
> [PATCH 5/5] pcmcia: export modalias in sysfs

yup.

> However, if you are of the opinion that these five patches should survive
> one -mm cycle first, please delay only them and do not let the other PCMCIA
> patches wait for them.
> 
> Also, one other pci-related change very helpful for PCMCIA was in -mm for
> quite some time and, to my knowledge, did not cause any problems. It was
> titled 
> 
> gregkh-pci-pci-pci-transparent-bridge-handling-improvements-pci-core.patch
> 
> and was present until 2.6.12-rc5-mm2. While a different patch intending the
> same functionality is in -mm, the related changes to the PCI infrastructure
> cause severe headaches (see bug 
> http://bugzilla.kernel.org/show_bug.cgi?id=4737 for example, other, similar
> reports were posted to lkml.) Therefore I'd suggest to merge the patch
> mentioned above at first, and fix up new PCI patches in -mm first.

The patches in -mm are staged after the git trees (mainly because I'm more
flexible with rejects and things than people who are stuck using an SCM ;)

So I tend to wait until the bk/scm guys have merged.