| Message ID | 1297465068-3982-2-git-send-email-manoj.iyer@canonical.com |
|---|---|
| State | Accepted |
| Commit | 2d9d9fe78b5c751a4c4890b357e651ddf8911860 |
| Headers | show |
On 02/11/2011 11:57 PM, Manoj Iyer wrote: > Patch was submitted upstream, https://lkml.org/lkml/2011/2/11/309 > > BugLink: http://bugs.launchpad.net/bugs/717435 > > Signed-off-by: Manoj Iyer <manoj.iyer@canonical.com> > This patch is not (yet) upstream. We cannot SRU patches before they are mainline. Please submit again, when it is in Linus tree. > This patch was tested on Lenovo x220 and was reported to work. > --- > drivers/mmc/host/sdhci-pci.c | 8 ++++++++ > 1 files changed, 8 insertions(+), 0 deletions(-) > > diff --git a/drivers/mmc/host/sdhci-pci.c b/drivers/mmc/host/sdhci-pci.c > index e021431..c53b22d 100644 > --- a/drivers/mmc/host/sdhci-pci.c > +++ b/drivers/mmc/host/sdhci-pci.c > @@ -415,6 +415,14 @@ static const struct pci_device_id pci_ids[] __devinitdata = { > }, > > { > + .vendor = PCI_VENDOR_ID_RICOH, > + .device = 0xe823, > + .subvendor = PCI_ANY_ID, > + .subdevice = PCI_ANY_ID, > + .driver_data = (kernel_ulong_t)&sdhci_ricoh_mmc, > + }, > + > + { > .vendor = PCI_VENDOR_ID_ENE, > .device = PCI_DEVICE_ID_ENE_CB712_SD, > .subvendor = PCI_ANY_ID,
Stefan, The patch is Q'd for .39 and is also tagged stable by the MMC maintainer, it will be really helpful to have this patch in Maverick asap as this fixes MMC card readers on a verity of Lenovo products. Thanks On Mon, Feb 14, 2011 at 7:20 AM, Stefan Bader <stefan.bader@canonical.com> wrote: > On 02/11/2011 11:57 PM, Manoj Iyer wrote: >> Patch was submitted upstream, https://lkml.org/lkml/2011/2/11/309 >> >> BugLink: http://bugs.launchpad.net/bugs/717435 >> >> Signed-off-by: Manoj Iyer <manoj.iyer@canonical.com> >> > This patch is not (yet) upstream. We cannot SRU patches before they are > mainline. Please submit again, when it is in Linus tree. > >> This patch was tested on Lenovo x220 and was reported to work. >> --- >> drivers/mmc/host/sdhci-pci.c | 8 ++++++++ >> 1 files changed, 8 insertions(+), 0 deletions(-) >> >> diff --git a/drivers/mmc/host/sdhci-pci.c b/drivers/mmc/host/sdhci-pci.c >> index e021431..c53b22d 100644 >> --- a/drivers/mmc/host/sdhci-pci.c >> +++ b/drivers/mmc/host/sdhci-pci.c >> @@ -415,6 +415,14 @@ static const struct pci_device_id pci_ids[] __devinitdata = { >> }, >> >> { >> + .vendor = PCI_VENDOR_ID_RICOH, >> + .device = 0xe823, >> + .subvendor = PCI_ANY_ID, >> + .subdevice = PCI_ANY_ID, >> + .driver_data = (kernel_ulong_t)&sdhci_ricoh_mmc, >> + }, >> + >> + { >> .vendor = PCI_VENDOR_ID_ENE, >> .device = PCI_DEVICE_ID_ENE_CB712_SD, >> .subvendor = PCI_ANY_ID, > > > -- > kernel-team mailing list > kernel-team@lists.ubuntu.com > https://lists.ubuntu.com/mailman/listinfo/kernel-team >
On 02/14/2011 05:20 AM, Stefan Bader wrote: > On 02/11/2011 11:57 PM, Manoj Iyer wrote: >> Patch was submitted upstream, https://lkml.org/lkml/2011/2/11/309 >> >> BugLink: http://bugs.launchpad.net/bugs/717435 >> >> Signed-off-by: Manoj Iyer<manoj.iyer@canonical.com> >> > This patch is not (yet) upstream. We cannot SRU patches before they are > mainline. Please submit again, when it is in Linus tree. > >> This patch was tested on Lenovo x220 and was reported to work. >> --- >> drivers/mmc/host/sdhci-pci.c | 8 ++++++++ >> 1 files changed, 8 insertions(+), 0 deletions(-) >> >> diff --git a/drivers/mmc/host/sdhci-pci.c b/drivers/mmc/host/sdhci-pci.c >> index e021431..c53b22d 100644 >> --- a/drivers/mmc/host/sdhci-pci.c >> +++ b/drivers/mmc/host/sdhci-pci.c >> @@ -415,6 +415,14 @@ static const struct pci_device_id pci_ids[] __devinitdata = { >> }, >> >> { >> + .vendor = PCI_VENDOR_ID_RICOH, >> + .device = 0xe823, >> + .subvendor = PCI_ANY_ID, >> + .subdevice = PCI_ANY_ID, >> + .driver_data = (kernel_ulong_t)&sdhci_ricoh_mmc, >> + }, >> + >> + { >> .vendor = PCI_VENDOR_ID_ENE, >> .device = PCI_DEVICE_ID_ENE_CB712_SD, >> .subvendor = PCI_ANY_ID, > > Stefan, I disagree. I think it would be quite easy to look at this mailing lists archive to find examples of where we have taken SRU patches before they have hit Linus' tree. Also, given the amount of hardware enablement being done by other parts of the company, we will be continuing to take patches to Maverick as long as necessary. Manjo, Acked-by: Brad Figg <brad.figg@canonical.com>
On 02/14/2011 07:20 PM, Brad Figg wrote: > On 02/14/2011 05:20 AM, Stefan Bader wrote: >> On 02/11/2011 11:57 PM, Manoj Iyer wrote: >>> Patch was submitted upstream, https://lkml.org/lkml/2011/2/11/309 >>> >>> BugLink: http://bugs.launchpad.net/bugs/717435 >>> >>> Signed-off-by: Manoj Iyer<manoj.iyer@canonical.com> >>> >> This patch is not (yet) upstream. We cannot SRU patches before they are >> mainline. Please submit again, when it is in Linus tree. >> >>> This patch was tested on Lenovo x220 and was reported to work. >>> --- >>> drivers/mmc/host/sdhci-pci.c | 8 ++++++++ >>> 1 files changed, 8 insertions(+), 0 deletions(-) >>> >>> diff --git a/drivers/mmc/host/sdhci-pci.c b/drivers/mmc/host/sdhci-pci.c >>> index e021431..c53b22d 100644 >>> --- a/drivers/mmc/host/sdhci-pci.c >>> +++ b/drivers/mmc/host/sdhci-pci.c >>> @@ -415,6 +415,14 @@ static const struct pci_device_id pci_ids[] >>> __devinitdata = { >>> }, >>> >>> { >>> + .vendor = PCI_VENDOR_ID_RICOH, >>> + .device = 0xe823, >>> + .subvendor = PCI_ANY_ID, >>> + .subdevice = PCI_ANY_ID, >>> + .driver_data = (kernel_ulong_t)&sdhci_ricoh_mmc, >>> + }, >>> + >>> + { >>> .vendor = PCI_VENDOR_ID_ENE, >>> .device = PCI_DEVICE_ID_ENE_CB712_SD, >>> .subvendor = PCI_ANY_ID, >> >> > > Stefan, > > I disagree. I think it would be quite easy to look at this mailing lists > archive to find examples of where we have taken SRU patches before they > have hit Linus' tree. > > Also, given the amount of hardware enablement being done by other parts > of the company, we will be continuing to take patches to Maverick as > long as necessary. > > > Manjo, > > Acked-by: Brad Figg <brad.figg@canonical.com> > Well if you are willing to back it, I won't stand in the way. I would still think having a patch not upstream should rather be an exception because it lessens the chance that this is a) forgotten or b) implemented in a different way which could cause trouble later. As it just happened today with the acpi_skip_timer_override quirks for the Edge Thinkpads things can end up in limbo and we just see the same issues again on the next release. (Plus the patch seemed to lack proper description) And the the 4month rule of enablement at least _was_ in the SRU rules for non-LTS releases because maintaining that for the LTS releases can be pain enough. Of course everything can change but it would be good to get updates if that happens (not only on a wiki page which as you know is sort of a write only device) so I know them too. ;-)
On 02/11/2011 03:57 PM, Manoj Iyer wrote: > Patch was submitted upstream, https://lkml.org/lkml/2011/2/11/309 > > BugLink: http://bugs.launchpad.net/bugs/717435 > > Signed-off-by: Manoj Iyer<manoj.iyer@canonical.com> > > This patch was tested on Lenovo x220 and was reported to work. > --- > drivers/mmc/host/sdhci-pci.c | 8 ++++++++ > 1 files changed, 8 insertions(+), 0 deletions(-) > > diff --git a/drivers/mmc/host/sdhci-pci.c b/drivers/mmc/host/sdhci-pci.c > index e021431..c53b22d 100644 > --- a/drivers/mmc/host/sdhci-pci.c > +++ b/drivers/mmc/host/sdhci-pci.c > @@ -415,6 +415,14 @@ static const struct pci_device_id pci_ids[] __devinitdata = { > }, > > { > + .vendor = PCI_VENDOR_ID_RICOH, > + .device = 0xe823, > + .subvendor = PCI_ANY_ID, > + .subdevice = PCI_ANY_ID, > + .driver_data = (kernel_ulong_t)&sdhci_ricoh_mmc, > + }, > + > + { > .vendor = PCI_VENDOR_ID_ENE, > .device = PCI_DEVICE_ID_ENE_CB712_SD, > .subvendor = PCI_ANY_ID, Applied and pushed to Maverick and Natty
diff --git a/drivers/mmc/host/sdhci-pci.c b/drivers/mmc/host/sdhci-pci.c index e021431..c53b22d 100644 --- a/drivers/mmc/host/sdhci-pci.c +++ b/drivers/mmc/host/sdhci-pci.c @@ -415,6 +415,14 @@ static const struct pci_device_id pci_ids[] __devinitdata = { }, { + .vendor = PCI_VENDOR_ID_RICOH, + .device = 0xe823, + .subvendor = PCI_ANY_ID, + .subdevice = PCI_ANY_ID, + .driver_data = (kernel_ulong_t)&sdhci_ricoh_mmc, + }, + + { .vendor = PCI_VENDOR_ID_ENE, .device = PCI_DEVICE_ID_ENE_CB712_SD, .subvendor = PCI_ANY_ID,
Patch was submitted upstream, https://lkml.org/lkml/2011/2/11/309 BugLink: http://bugs.launchpad.net/bugs/717435 Signed-off-by: Manoj Iyer <manoj.iyer@canonical.com> This patch was tested on Lenovo x220 and was reported to work. --- drivers/mmc/host/sdhci-pci.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-)