| Message ID | 57023416.17EujnXPCo@wuerfel |
|---|---|
| State | Not Applicable, archived |
| Delegated to: | David Miller |
| Headers | show |
On Tue, 2015-10-13 at 13:37 +0200, Arnd Bergmann wrote: > This is the majority of all build warnings we get on allmodconfig > (both i386 and arm), > so it would be really nice to have it fixed before 4.3. For all I can > tell, the > patch still applies on your branch too, but see below for the rebased > version. > > I also note that your branch is not part of linux-next, is that > intentional? No, I assume it is because the linux-next maintainer has not picked up my tree.
On Tue, 2015-10-13 at 13:37 +0200, Arnd Bergmann wrote: > This is the majority of all build warnings we get on allmodconfig > (both i386 and arm), > so it would be really nice to have it fixed before 4.3. For all I can > tell, the > patch still applies on your branch too, but see below for the rebased > version. > > I also note that your branch is not part of linux-next, is that > intentional? > > Arnd Huh are you sure you used by dev-queue branch? I ask because this is what I am getting when I try to apply your patch: git am .apply/i40evf-fix-32-bit-build-warnings.patch Applying: Jesse Brandeburg fixed a bug for 32-bit systems in the i40e driver error: patch failed: drivers/net/ethernet/intel/i40evf/i40e_common.c:443 error: drivers/net/ethernet/intel/i40evf/i40e_common.c: patch does not apply Patch failed at 0001 Jesse Brandeburg fixed a bug for 32-bit systems in the i40e driver The copy of the patch that failed is found in: /home/jtkirshe/Public/next-queue/.git/rebase-apply/patch When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". [12:02:27 @jtkirshe-linux:next-queue]$ patch -p1 <.apply/i40evf-fix-32 -bit-build-warnings.patch patching file drivers/net/ethernet/intel/i40evf/i40e_common.c Reversed (or previously applied) patch detected! Assume -R? [n] Apply anyway? [n] Skipping patch. 2 out of 2 hunks ignored -- saving rejects to file drivers/net/ethernet/intel/i40evf/i40e_common.c.rej [12:02:52 @jtkirshe-linux:next-queue]$ Even looking at the code, the code your changing does not exist in my dev-queue branch of my next-queue tree.
On Tue, 13 Oct 2015 13:37:04 +0200 Arnd Bergmann <arnd@arndb.de> wrote: > On Monday 12 October 2015 23:18:21 you wrote: > > On Wed, 2015-10-07 at 22:13 +0200, Arnd Bergmann wrote: > > > Jesse Brandeburg fixed a bug for 32-bit systems in the i40e driver > > > in commit 9c70d7cebfec5 ("i40e: fix 32 bit build warnings"), but the > > > same code still exists in the i40evf driver and causes compilation > > > warnings in ARM and x86 allmodconfig: > > > > > > drivers/net/ethernet/intel/i40evf/i40e_common.c:445:68: warning: cast > > > from pointer to integer of different size [-Wpointer-to-int-cast] > > > drivers/net/ethernet/intel/i40evf/i40e_common.c:446:71: warning: cast > > > from pointer to integer of different size [-Wpointer-to-int-cast] > > > > > > This applies the same fix by removing the broken code. > > > > > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > > > > Does not apply at all to my next-queue tree (dev-queue branch), my > > guess is that this is already fixed in one of the patches already in my > > queue. > > > > I still get these warnings on your branch: Make sure you're pulling from the dev-queue branch, not the master branch of Jeff's next-queue repo. I've made that mistake many times, and I do see that the code in question is not present in: https://git.kernel.org/cgit/linux/kernel/git/jkirsher/next-queue.git/tree/drivers/net/ethernet/intel/i40evf/i40e_common.c?h=dev-queue -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, 13 Oct 2015 12:05:32 -0700 Jeff Kirsher <jeffrey.t.kirsher@intel.com> wrote: > On Tue, 2015-10-13 at 13:37 +0200, Arnd Bergmann wrote: > > This is the majority of all build warnings we get on allmodconfig > > (both i386 and arm), > > so it would be really nice to have it fixed before 4.3. For all I can > > tell, the > > patch still applies on your branch too, but see below for the rebased > > version. > > > > I also note that your branch is not part of linux-next, is that > > intentional? > > > > Arnd > > Huh are you sure you used by dev-queue branch? I ask because this is > what I am getting when I try to apply your patch: > > git am .apply/i40evf-fix-32-bit-build-warnings.patch > Applying: Jesse Brandeburg fixed a bug for 32-bit systems in the i40e > driver > error: patch failed: > drivers/net/ethernet/intel/i40evf/i40e_common.c:443 > error: drivers/net/ethernet/intel/i40evf/i40e_common.c: patch does not > apply > Patch failed at 0001 Jesse Brandeburg fixed a bug for 32-bit systems in > the i40e driver > The copy of the patch that failed is found in: > /home/jtkirshe/Public/next-queue/.git/rebase-apply/patch > When you have resolved this problem, run "git am --continue". > If you prefer to skip this patch, run "git am --skip" instead. > To restore the original branch and stop patching, run "git am --abort". > [12:02:27 @jtkirshe-linux:next-queue]$ patch -p1 <.apply/i40evf-fix-32 > -bit-build-warnings.patch > patching file drivers/net/ethernet/intel/i40evf/i40e_common.c > Reversed (or previously applied) patch detected! Assume -R? [n] > Apply anyway? [n] > Skipping patch. > 2 out of 2 hunks ignored -- saving rejects to file > drivers/net/ethernet/intel/i40evf/i40e_common.c.rej > [12:02:52 @jtkirshe-linux:next-queue]$ > > Even looking at the code, the code your changing does not exist in my > dev-queue branch of my next-queue tree. it was already fixed via commit 7890f6979a8eab436487396d6e2e0def8633fa16 Author: Jesse Brandeburg <jesse.brandeburg@intel.com> Date: Tue Oct 13 11:15:46 2015 -0700 i40evf: fix overlong BIT defines -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tuesday 13 October 2015 12:25:10 Jesse Brandeburg wrote: > On Tue, 13 Oct 2015 13:37:04 +0200 > Arnd Bergmann <arnd@arndb.de> wrote: > > > On Monday 12 October 2015 23:18:21 you wrote: > > > On Wed, 2015-10-07 at 22:13 +0200, Arnd Bergmann wrote: > > > > Jesse Brandeburg fixed a bug for 32-bit systems in the i40e driver > > > > in commit 9c70d7cebfec5 ("i40e: fix 32 bit build warnings"), but the > > > > same code still exists in the i40evf driver and causes compilation > > > > warnings in ARM and x86 allmodconfig: > > > > > > > > drivers/net/ethernet/intel/i40evf/i40e_common.c:445:68: warning: cast > > > > from pointer to integer of different size [-Wpointer-to-int-cast] > > > > drivers/net/ethernet/intel/i40evf/i40e_common.c:446:71: warning: cast > > > > from pointer to integer of different size [-Wpointer-to-int-cast] > > > > > > > > This applies the same fix by removing the broken code. > > > > > > > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > > > > > > Does not apply at all to my next-queue tree (dev-queue branch), my > > > guess is that this is already fixed in one of the patches already in my > > > queue. > > > > > > > I still get these warnings on your branch: > > Make sure you're pulling from the dev-queue branch, not the master > branch of Jeff's next-queue repo. Indeed, I was only looking at the branch that last got pulled into net-next, assuming that was the one that was where the fixes for 4.3 are in. Sorry about that. > I've made that mistake many times, and I do see that the code in > question is not present in: > https://git.kernel.org/cgit/linux/kernel/git/jkirsher/next-queue.git/tree/drivers/net/ethernet/intel/i40evf/i40e_common.c?h=dev-queue Ok, I see your commit 7890f6979a8 ("i40evf: fix overlong BIT defines") there now. Any chance to get that into mainline? The branch appears to have a mix of new features and bug fixes, so it looks like it's at least not destined for 4.3. Arnd -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/ethernet/intel/i40evf/i40e_common.c b/drivers/net/ethernet/intel/i40evf/i40e_common.c index b98b642b897a..a98a31f1e246 100644 --- a/drivers/net/ethernet/intel/i40evf/i40e_common.c +++ b/drivers/net/ethernet/intel/i40evf/i40e_common.c @@ -443,9 +443,6 @@ static i40e_status i40e_aq_get_set_rss_lut(struct i40e_hw *hw, I40E_AQC_SET_RSS_LUT_TABLE_TYPE_SHIFT) & I40E_AQC_SET_RSS_LUT_TABLE_TYPE_MASK)); - cmd_resp->addr_high = cpu_to_le32(high_16_bits((u64)lut)); - cmd_resp->addr_low = cpu_to_le32(lower_32_bits((u64)lut)); - status = i40evf_asq_send_command(hw, &desc, lut, lut_size, NULL); return status; @@ -520,8 +517,6 @@ static i40e_status i40e_aq_get_set_rss_key(struct i40e_hw *hw, I40E_AQC_SET_RSS_KEY_VSI_ID_SHIFT) & I40E_AQC_SET_RSS_KEY_VSI_ID_MASK)); cmd_resp->vsi_id |= cpu_to_le16((u16)I40E_AQC_SET_RSS_KEY_VSI_VALID); - cmd_resp->addr_high = cpu_to_le32(high_16_bits((u64)key)); - cmd_resp->addr_low = cpu_to_le32(lower_32_bits((u64)key)); status = i40evf_asq_send_command(hw, &desc, key, key_size, NULL);