From: Paul Gortmaker <paul.gortmaker@windriver.com> To: Ben Hutchings <ben@decadent.org.uk> Cc: Greg KH <gregkh@linuxfoundation.org>, linux-kernel@vger.kernel.org, stable@vger.kernel.org, torvalds@linux-foundation.org, akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk, Kenth Eriksson <kenth.eriksson@transmode.com>, "David S. Miller" <davem@davemloft.net>, afleming@freescale.com Subject: Re: [ 06/59] Fix non TBI PHY access; a bad merge undid bug fix in a previous commit. Date: Sun, 15 Apr 2012 20:16:08 -0400 [thread overview] Message-ID: <CAP=VYLp6F3YB_71aX=FxLf_dz7kzs-W+dPcA4OmC0VV0kQteiw@mail.gmail.com> (raw) In-Reply-To: <1334206506.7150.386.camel@deadeye> On Thu, Apr 12, 2012 at 12:55 AM, Ben Hutchings <ben@decadent.org.uk> wrote: > On Wed, 2012-04-11 at 16:10 -0700, Greg KH wrote: >> 3.2-stable review patch. If anyone has any objections, please let me know. >> >> ------------------ >> >> >> From: Kenth Eriksson <kenth.eriksson@transmode.com> >> >> [ Upstream commit 464b57da56910c8737ede75ad820b9a7afc46b3e ] >> >> The merge done in commit b26e478f undid bug fix in commit c3e072f8 >> ("net: fsl_pq_mdio: fix non tbi phy access"), with the result that non >> TBI (e.g. MDIO) PHYs cannot be accessed. > [...] > > This doesn't look relevant to 3.2. > > $ git describe --contains b26e478f > v3.3-rc1~182^2~207 > $ git describe --contains c3e072f8 > v3.3-rc1~182^2~598 > $ git show c3e072f8 | head -8 > commit c3e072f8a6c5625028531c40ec65f7e301531be2 > Author: Baruch Siach <baruch@tkos.co.il> > Date: Mon Nov 14 08:21:30 2011 +0200 > > net: fsl_pq_mdio: fix non tbi phy access > > Since 952c5ca1 (fsl_pq_mdio: Clean up tbi address configuration) .probe returns > -EBUSY when the "tbi-phy" node is missing. Fix this. > $ git describe --contains 952c5ca1 > v3.3-rc1~182^2~603 > $ git rev-list v3.2..v3.2.14 drivers/net/ethernet/freescale/fsl_pq_mdio.c I think 952c5ca1 is a red herring; What is called out as the regression commit appeared in tree earlier than that as 28d8ea2d568. $ git describe --contains 28d8ea2d568 v3.2-rc6~3^2~6 $ git show 952c5ca1|diffstat -p0 b/drivers/net/ethernet/freescale/fsl_pq_mdio.c | 53 +++---------------------- 1 file changed, 8 insertions(+), 45 deletions(-) $ git show 28d8ea2d568 | diffstat -p0 b/drivers/net/ethernet/freescale/fsl_pq_mdio.c | 53 +++---------------------- 1 file changed, 8 insertions(+), 45 deletions(-) $ I documented some history about this in commit 1ee4af86fa16d636. I wasn't aware of the bad merge at the time; adding the TBI node to my mpc836x board DTS simply fixed the issue with no source changes. Paul. > $ > > Ben. > > -- > Ben Hutchings > It is easier to change the specification to fit the program than vice versa.
WARNING: multiple messages have this Message-ID (diff)
From: Paul Gortmaker <paul.gortmaker@windriver.com> To: Ben Hutchings <ben@decadent.org.uk> Cc: Greg KH <gregkh@linuxfoundation.org>, linux-kernel@vger.kernel.org, stable@vger.kernel.org, torvalds@linux-foundation.org, akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk, Kenth Eriksson <kenth.eriksson@transmode.com>, "David S. Miller" <davem@davemloft.net>, afleming@freescale.com Subject: Re: [ 06/59] Fix non TBI PHY access; a bad merge undid bug fix in a previous commit. Date: Sun, 15 Apr 2012 20:16:08 -0400 [thread overview] Message-ID: <CAP=VYLp6F3YB_71aX=FxLf_dz7kzs-W+dPcA4OmC0VV0kQteiw@mail.gmail.com> (raw) In-Reply-To: <1334206506.7150.386.camel@deadeye> On Thu, Apr 12, 2012 at 12:55 AM, Ben Hutchings <ben@decadent.org.uk> wrote: > On Wed, 2012-04-11 at 16:10 -0700, Greg KH wrote: >> 3.2-stable review patch. �If anyone has any objections, please let me know. >> >> ------------------ >> >> >> From: Kenth Eriksson <kenth.eriksson@transmode.com> >> >> [ Upstream commit 464b57da56910c8737ede75ad820b9a7afc46b3e ] >> >> The merge done in commit b26e478f undid bug fix in commit c3e072f8 >> ("net: fsl_pq_mdio: fix non tbi phy access"), with the result that non >> TBI (e.g. MDIO) PHYs cannot be accessed. > [...] > > This doesn't look relevant to 3.2. > > $ git describe --contains b26e478f > v3.3-rc1~182^2~207 > $ git describe --contains c3e072f8 > v3.3-rc1~182^2~598 > $ git show c3e072f8 | head -8 > commit c3e072f8a6c5625028531c40ec65f7e301531be2 > Author: Baruch Siach <baruch@tkos.co.il> > Date: � Mon Nov 14 08:21:30 2011 +0200 > > � �net: fsl_pq_mdio: fix non tbi phy access > > � �Since 952c5ca1 (fsl_pq_mdio: Clean up tbi address configuration) .probe returns > � �-EBUSY when the "tbi-phy" node is missing. Fix this. > $ git describe --contains 952c5ca1 > v3.3-rc1~182^2~603 > $ git rev-list v3.2..v3.2.14 drivers/net/ethernet/freescale/fsl_pq_mdio.c I think 952c5ca1 is a red herring; What is called out as the regression commit appeared in tree earlier than that as 28d8ea2d568. $ git describe --contains 28d8ea2d568 v3.2-rc6~3^2~6 $ git show 952c5ca1|diffstat -p0 b/drivers/net/ethernet/freescale/fsl_pq_mdio.c | 53 +++---------------------- 1 file changed, 8 insertions(+), 45 deletions(-) $ git show 28d8ea2d568 | diffstat -p0 b/drivers/net/ethernet/freescale/fsl_pq_mdio.c | 53 +++---------------------- 1 file changed, 8 insertions(+), 45 deletions(-) $ I documented some history about this in commit 1ee4af86fa16d636. I wasn't aware of the bad merge at the time; adding the TBI node to my mpc836x board DTS simply fixed the issue with no source changes. Paul. > $ > > Ben. > > -- > Ben Hutchings > It is easier to change the specification to fit the program than vice versa.
next prev parent reply other threads:[~2012-04-16 0:16 UTC|newest] Thread overview: 65+ messages / expand[flat|nested] mbox.gz Atom feed top 2012-04-11 23:12 [ 00/59] 3.2.15-stable review Greg KH 2012-04-11 23:10 ` [ 01/59] x86 bpf_jit: fix a bug in emitting the 16-bit immediate operand of AND Greg KH 2012-04-11 23:10 ` [ 02/59] tg3: Fix 5717 serdes powerdown problem Greg KH 2012-04-11 23:10 ` [ 03/59] sky2: dont overwrite settings for PHY Quick link Greg KH 2012-04-11 23:10 ` [ 04/59] rose_dev: fix memcpy-bug in rose_set_mac_address Greg KH 2012-04-11 23:10 ` [ 05/59] net: usb: cdc_eem: fix mtu Greg KH 2012-04-11 23:10 ` [ 06/59] Fix non TBI PHY access; a bad merge undid bug fix in a previous commit Greg KH 2012-04-12 4:55 ` Ben Hutchings [not found] ` <OFFBE17A27.42E05B7A-ONC12579DE.00262282-C12579DE.0026AD98@transmode.se> 2012-04-12 15:02 ` Ben Hutchings 2012-04-16 0:16 ` Paul Gortmaker [this message] 2012-04-16 0:16 ` Paul Gortmaker 2012-04-16 0:32 ` Ben Hutchings 2012-04-11 23:10 ` [ 07/59] ASoC: wm8994: Update WM8994 DCS calibration Greg KH 2012-04-11 23:10 ` [ 08/59] mtd: ixp4xx: oops in ixp4xx_flash_probe Greg KH 2012-04-11 23:10 ` [ 09/59] mtd: mips: lantiq: reintroduce support for cmdline partitions Greg KH 2012-04-11 23:10 ` [ 10/59] mtd: nand: gpmi: use correct member for checking NAND_BBT_USE_FLASH Greg KH 2012-04-11 23:10 ` [ 11/59] mtd: sst25l: initialize writebufsize Greg KH 2012-04-11 23:10 ` [ 12/59] mtd: block2mtd: " Greg KH 2012-04-11 23:10 ` [ 13/59] mtd: lart: " Greg KH 2012-04-11 23:10 ` [ 14/59] mtd: m25p80: set writebufsize Greg KH 2012-04-11 23:10 ` [ 15/59] ACPI: Do cpufreq clamping for throttling per package v2 Greg KH 2012-04-11 23:10 ` [ 16/59] PNPACPI: Fix device ref leaking in acpi_pnp_match Greg KH 2012-04-11 23:10 ` [ 17/59] ACPICA: Fix regression in FADT revision checks Greg KH 2012-04-11 23:10 ` [ 18/59] modpost: fix ALL_INIT_DATA_SECTIONS Greg KH 2012-04-11 23:10 ` [ 19/59] genirq: Adjust irq thread affinity on IRQ_SET_MASK_OK_NOCOPY return value Greg KH 2012-04-11 23:10 ` [ 20/59] tracing: Fix ftrace stack trace entries Greg KH 2012-04-11 23:10 ` [ 21/59] tracing: Fix ent_size in trace output Greg KH 2012-04-11 23:10 ` [ 22/59] m68k/mac: Add missing platform check before registering platform devices Greg KH 2012-04-11 23:10 ` [ 23/59] mac80211: fix possible tid_rx->reorder_timer use after free Greg KH 2012-04-11 23:10 ` [ 24/59] rtlwifi: rtl8192ce: rtl8192cu: rtl8192de: Fix low-gain setting when scanning Greg KH 2012-04-11 23:11 ` [ 25/59] drm: Validate requested virtual size against allocated fb size Greg KH 2012-04-11 23:11 ` [ 26/59] drm/radeon/kms: fix fans after resume Greg KH 2012-04-11 23:11 ` [ 27/59] drm/i915: no-lvds quirk on MSI DC500 Greg KH 2012-04-11 23:11 ` [ 28/59] drm/i915: Sanitize BIOS debugging bits from PIPECONF Greg KH 2012-04-11 23:11 ` [ 29/59] drm/i915: Add lock on drm_helper_resume_force_mode Greg KH 2012-04-11 23:11 ` [ 30/59] drm/i915: quirk away broken OpRegion VBT Greg KH 2012-04-11 23:11 ` [ 31/59] r8169: runtime resume before shutdown Greg KH 2012-04-11 23:11 ` [ 32/59] target: Fix unsupported WRITE_SAME sense payload Greg KH 2012-04-11 23:11 ` [ 33/59] kgdb,debug_core: pass the breakpoint struct instead of address and memory Greg KH 2012-04-11 23:11 ` [ 34/59] kgdbts: Fix kernel oops with CONFIG_DEBUG_RODATA Greg KH 2012-04-11 23:11 ` [ 35/59] kgdbts: (1 of 2) fix single step awareness to work correctly with SMP Greg KH 2012-04-11 23:11 ` [ 36/59] kgdbts: (2 " Greg KH 2012-04-11 23:11 ` [ 37/59] x86,kgdb: Fix DEBUG_RODATA limitation using text_poke() Greg KH 2012-04-11 23:11 ` [ 38/59] CIFS: Fix VFS lock usage for oplocked files Greg KH 2012-04-11 23:11 ` [ 39/59] [PATCH] ARM: tegra: remove Tegra30 errata from MACH_TEGRA_DT Greg KH 2012-04-11 23:11 ` [ 40/59] mmc: sdhci-dove: Fix compile error by including module.h Greg KH 2012-04-11 23:11 ` [ 41/59] mmc: atmel-mci: correct data timeout computation Greg KH 2012-04-11 23:11 ` [ 42/59] tcm_fc: Add abort flag for gracefully handling exchange timeout Greg KH 2012-04-11 23:11 ` [ 43/59] tcm_fc: Do not free tpg structure during wq allocation failure Greg KH 2012-04-11 23:11 ` [ 44/59] sysctl: fix write access to dmesg_restrict/kptr_restrict Greg KH 2012-04-11 23:11 ` [ 45/59] modpost: Fix modpost license checking of vmlinux.o Greg KH 2012-04-11 23:11 ` [ 46/59] x86/PCI: use host bridge _CRS info on MSI MS-7253 Greg KH 2012-04-11 23:11 ` [ 47/59] x86/PCI: do not tie MSI MS-7253 use_crs quirk to BIOS version Greg KH 2012-04-11 23:11 ` [ 48/59] TOMOYO: Fix mount flags checking order Greg KH 2012-04-11 23:11 ` [ 49/59] Revert "x86/ioapic: Add register level checks to detect bogus io-apic entries" Greg KH 2012-04-11 23:11 ` [ 50/59] acer-wmi: No wifi rfkill on Sony machines Greg KH 2012-04-11 23:11 ` [ 51/59] Fix length of buffer copied in __nfs4_get_acl_uncached Greg KH 2012-04-11 23:11 ` [ 52/59] sched/x86: Fix overflow in cyc2ns_offset Greg KH 2012-04-11 23:11 ` [ 53/59] mfd: Clear twl6030 IRQ status register only once Greg KH 2012-04-11 23:11 ` [ 54/59] USB: Add Motorola Rokr E6 Id to the USBNet driver "zaurus" Greg KH 2012-04-11 23:11 ` [ 55/59] ioat: fix size of completion for Xen Greg KH 2012-04-11 23:11 ` [ 56/59] ASoC: ak4642: fixup: mute needs +1 step Greg KH 2012-04-11 23:11 ` [ 57/59] cred: copy_process() should clear child->replacement_session_keyring Greg KH 2012-04-11 23:11 ` [ 58/59] iommu/amd: Make sure IOMMU interrupts are re-enabled on resume Greg KH 2012-04-11 23:11 ` [ 59/59] Bluetooth: Fix l2cap conn failures for ssp devices Greg KH
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='CAP=VYLp6F3YB_71aX=FxLf_dz7kzs-W+dPcA4OmC0VV0kQteiw@mail.gmail.com' \ --to=paul.gortmaker@windriver.com \ --cc=afleming@freescale.com \ --cc=akpm@linux-foundation.org \ --cc=alan@lxorguk.ukuu.org.uk \ --cc=ben@decadent.org.uk \ --cc=davem@davemloft.net \ --cc=gregkh@linuxfoundation.org \ --cc=kenth.eriksson@transmode.com \ --cc=linux-kernel@vger.kernel.org \ --cc=stable@vger.kernel.org \ --cc=torvalds@linux-foundation.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
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.