diff for duplicates of <20090429220930.126527883@mini.kroah.org> diff --git a/a/1.txt b/N1/1.txt index ea3677d..2887829 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,3 +1,28 @@ -An embedded and charset-unspecified text was scrubbed... -Name: ath9k-ar9280-pci-devices-must-serialize-io-as-well.patch -Url: http://lists.ath9k.org/pipermail/ath9k-devel/attachments/20090429/3b3642b3/attachment.txt +2.6.27-stable review patch. If anyone has any objections, please let us know. + +------------------ + +From: Luis R. Rodriguez <lrodriguez@atheros.com> + +This is a port of: +commit SHA1 5ec905a8df3fa877566ba98298433fbfb3d688cc +for 2.6.27 + +Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> +--- + drivers/net/wireless/ath9k/hw.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/drivers/net/wireless/ath9k/hw.c ++++ b/drivers/net/wireless/ath9k/hw.c +@@ -3313,7 +3313,8 @@ static struct ath_hal *ath9k_hw_do_attac + } + + if (ah->ah_config.serialize_regmode == SER_REG_MODE_AUTO) { +- if (ah->ah_macVersion == AR_SREV_VERSION_5416_PCI) { ++ if (ah->ah_macVersion == AR_SREV_VERSION_5416_PCI || ++ (AR_SREV_9280(ah) && !ah->ah_isPciExpress)) { + ah->ah_config.serialize_regmode = + SER_REG_MODE_ON; + } else { diff --git a/a/content_digest b/N1/content_digest index a633be3..71227aa 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,13 +1,59 @@ "ref\020090429220659.339950874@mini.kroah.org\0" "ref\020090429221657.GA11765@kroah.com\0" "From\0Greg KH <gregkh@suse.de>\0" - "Subject\0[ath9k-devel] [patch 48/58] ath9k: AR9280 PCI devices must serialize IO as well\0" + "Subject\0[patch 48/58] ath9k: AR9280 PCI devices must serialize IO as well\0" "Date\0Wed, 29 Apr 2009 15:07:47 -0700\0" - "To\0ath9k-devel@lists.ath9k.org\0" + "To\0linux-kernel@vger.kernel.org" + " stable@kernel.org\0" + "Cc\0Justin Forbes <jmforbes@linuxtx.org>" + Zwane Mwaikambo <zwane@arm.linux.org.uk> + Theodore Ts'o <tytso@mit.edu> + Randy Dunlap <rdunlap@xenotime.net> + Dave Jones <davej@redhat.com> + Chuck Wolber <chuckw@quantumlinux.com> + Chris Wedgwood <reviews@ml.cw.f00f.org> + Michael Krufky <mkrufky@linuxtv.org> + Chuck Ebbert <cebbert@redhat.com> + Domenico Andreoli <cavokz@gmail.com> + Willy Tarreau <w@1wt.eu> + Rodrigo Rubira Branco <rbranco@la.checkpoint.com> + Jake Edge <jake@lwn.net> + Eugene Teo <eteo@redhat.com> + torvalds@linux-foundation.org + akpm@linux-foundation.org + alan@lxorguk.ukuu.org.uk + Luis R. Rodriguez <lrodriguez@atheros.com> + ath9k-devel@venema.h4ckr.net + " linux-wireless@vger.kernel.org\0" "\00:1\0" "b\0" - "An embedded and charset-unspecified text was scrubbed...\n" - "Name: ath9k-ar9280-pci-devices-must-serialize-io-as-well.patch\n" - Url: http://lists.ath9k.org/pipermail/ath9k-devel/attachments/20090429/3b3642b3/attachment.txt + "2.6.27-stable review patch. If anyone has any objections, please let us know.\n" + "\n" + "------------------\n" + "\n" + "From: Luis R. Rodriguez <lrodriguez@atheros.com>\n" + "\n" + "This is a port of:\n" + "commit SHA1 5ec905a8df3fa877566ba98298433fbfb3d688cc\n" + "for 2.6.27\n" + "\n" + "Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>\n" + "Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>\n" + "---\n" + " drivers/net/wireless/ath9k/hw.c | 3 ++-\n" + " 1 file changed, 2 insertions(+), 1 deletion(-)\n" + "\n" + "--- a/drivers/net/wireless/ath9k/hw.c\n" + "+++ b/drivers/net/wireless/ath9k/hw.c\n" + "@@ -3313,7 +3313,8 @@ static struct ath_hal *ath9k_hw_do_attac\n" + " \t}\n" + " \n" + " \tif (ah->ah_config.serialize_regmode == SER_REG_MODE_AUTO) {\n" + "-\t\tif (ah->ah_macVersion == AR_SREV_VERSION_5416_PCI) {\n" + "+\t\tif (ah->ah_macVersion == AR_SREV_VERSION_5416_PCI ||\n" + "+\t\t (AR_SREV_9280(ah) && !ah->ah_isPciExpress)) {\n" + " \t\t\tah->ah_config.serialize_regmode =\n" + " \t\t\t\tSER_REG_MODE_ON;\n" + " \t\t} else {" -272bbae30feb729bf4ab7daa7c81b60296b5f6c3fb721070d364f1ec638cc9b2 +535518919d0fb6d594986b1ecb768bf259d874c9773bfc4fe5013ec3a4b36cf4
diff --git a/a/1.txt b/N2/1.txt index ea3677d..2887829 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -1,3 +1,28 @@ -An embedded and charset-unspecified text was scrubbed... -Name: ath9k-ar9280-pci-devices-must-serialize-io-as-well.patch -Url: http://lists.ath9k.org/pipermail/ath9k-devel/attachments/20090429/3b3642b3/attachment.txt +2.6.27-stable review patch. If anyone has any objections, please let us know. + +------------------ + +From: Luis R. Rodriguez <lrodriguez@atheros.com> + +This is a port of: +commit SHA1 5ec905a8df3fa877566ba98298433fbfb3d688cc +for 2.6.27 + +Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> +--- + drivers/net/wireless/ath9k/hw.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/drivers/net/wireless/ath9k/hw.c ++++ b/drivers/net/wireless/ath9k/hw.c +@@ -3313,7 +3313,8 @@ static struct ath_hal *ath9k_hw_do_attac + } + + if (ah->ah_config.serialize_regmode == SER_REG_MODE_AUTO) { +- if (ah->ah_macVersion == AR_SREV_VERSION_5416_PCI) { ++ if (ah->ah_macVersion == AR_SREV_VERSION_5416_PCI || ++ (AR_SREV_9280(ah) && !ah->ah_isPciExpress)) { + ah->ah_config.serialize_regmode = + SER_REG_MODE_ON; + } else { diff --git a/a/content_digest b/N2/content_digest index a633be3..b93c945 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,13 +1,60 @@ "ref\020090429220659.339950874@mini.kroah.org\0" "ref\020090429221657.GA11765@kroah.com\0" "From\0Greg KH <gregkh@suse.de>\0" - "Subject\0[ath9k-devel] [patch 48/58] ath9k: AR9280 PCI devices must serialize IO as well\0" + "Subject\0[patch 48/58] ath9k: AR9280 PCI devices must serialize IO as well\0" "Date\0Wed, 29 Apr 2009 15:07:47 -0700\0" - "To\0ath9k-devel@lists.ath9k.org\0" + "To\0linux-kernel@vger.kernel.org" + " stable@kernel.org\0" + "Cc\0Justin Forbes <jmforbes@linuxtx.org>" + Zwane Mwaikambo <zwane@arm.linux.org.uk> + Theodore Ts'o <tytso@mit.edu> + Randy Dunlap <rdunlap@xenotime.net> + Dave Jones <davej@redhat.com> + Chuck Wolber <chuckw@quantumlinux.com> + Chris Wedgwood <reviews@ml.cw.f00f.org> + Michael Krufky <mkrufky@linuxtv.org> + Chuck Ebbert <cebbert@redhat.com> + Domenico Andreoli <cavokz@gmail.com> + Willy Tarreau <w@1wt.eu> + Rodrigo Rubira Branco <rbranco@la.checkpoint.com> + Jake Edge <jake@lwn.net> + Eugene Teo <eteo@redhat.com> + torvalds@linux-foundation.org + akpm@linux-foundation.org + alan@lxorguk.ukuu.org.uk + Luis R. Rodriguez <lrodriguez@atheros.com> + ath9k-devel@venema.h4ckr.net + " linux-wireless@vger.kernel.org\0" "\00:1\0" + "fn\0ath9k-ar9280-pci-devices-must-serialize-io-as-well.patch\0" "b\0" - "An embedded and charset-unspecified text was scrubbed...\n" - "Name: ath9k-ar9280-pci-devices-must-serialize-io-as-well.patch\n" - Url: http://lists.ath9k.org/pipermail/ath9k-devel/attachments/20090429/3b3642b3/attachment.txt + "2.6.27-stable review patch. If anyone has any objections, please let us know.\n" + "\n" + "------------------\n" + "\n" + "From: Luis R. Rodriguez <lrodriguez@atheros.com>\n" + "\n" + "This is a port of:\n" + "commit SHA1 5ec905a8df3fa877566ba98298433fbfb3d688cc\n" + "for 2.6.27\n" + "\n" + "Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>\n" + "Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>\n" + "---\n" + " drivers/net/wireless/ath9k/hw.c | 3 ++-\n" + " 1 file changed, 2 insertions(+), 1 deletion(-)\n" + "\n" + "--- a/drivers/net/wireless/ath9k/hw.c\n" + "+++ b/drivers/net/wireless/ath9k/hw.c\n" + "@@ -3313,7 +3313,8 @@ static struct ath_hal *ath9k_hw_do_attac\n" + " \t}\n" + " \n" + " \tif (ah->ah_config.serialize_regmode == SER_REG_MODE_AUTO) {\n" + "-\t\tif (ah->ah_macVersion == AR_SREV_VERSION_5416_PCI) {\n" + "+\t\tif (ah->ah_macVersion == AR_SREV_VERSION_5416_PCI ||\n" + "+\t\t (AR_SREV_9280(ah) && !ah->ah_isPciExpress)) {\n" + " \t\t\tah->ah_config.serialize_regmode =\n" + " \t\t\t\tSER_REG_MODE_ON;\n" + " \t\t} else {" -272bbae30feb729bf4ab7daa7c81b60296b5f6c3fb721070d364f1ec638cc9b2 +33fcf4a3a7cf8a2e27b0ad26df73ee4c54c2d6b05fd006a777dedbbad314443d
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.