| Message ID | 1419766622-10911-1-git-send-email-oscar.forner.martinez@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Kalle Valo |
| Headers | show |
Oscar Forner Martinez <oscar.forner.martinez@gmail.com> writes: > Two lines with more than 80 characters per line have been split in several lines. > > Signed-off-by: Oscar Forner Martinez <oscar.forner.martinez@gmail.com> Thanks, applied to wireless-drivers-next.git.
On 7 January 2015 at 18:55, Kalle Valo <kvalo@codeaurora.org> wrote: > Oscar Forner Martinez <oscar.forner.martinez@gmail.com> writes: > >> Two lines with more than 80 characters per line have been split in several lines. >> >> Signed-off-by: Oscar Forner Martinez <oscar.forner.martinez@gmail.com> > > Thanks, applied to wireless-drivers-next.git. Could you still replace it (V4) with an older version (V3)? Before I explained V3 was OK Oscar already sent this (worse) V4. This is not critical though, we can always send separated patch for one more line > 80 chars.
Rafa? Mi?ecki <zajec5@gmail.com> writes: > On 7 January 2015 at 18:55, Kalle Valo <kvalo@codeaurora.org> wrote: >> Oscar Forner Martinez <oscar.forner.martinez@gmail.com> writes: >> >>> Two lines with more than 80 characters per line have been split in several lines. >>> >>> Signed-off-by: Oscar Forner Martinez <oscar.forner.martinez@gmail.com> >> >> Thanks, applied to wireless-drivers-next.git. > > Could you still replace it (V4) with an older version (V3)? Before I > explained V3 was OK Oscar already sent this (worse) V4. No. I'm not going to rebase a public git tree unless there's a huge disaster. But if I see V4 I'm going to assume that's the one I need to apply, not some older version. If V4 is not good for some reason, make it ABSOLUTELY clear that I should not apply it. I do not want to start guessing what patch I should apply. > This is not critical though, we can always send separated patch for > one more line > 80 chars. Please send a followup patch if you want to fix something.
On 7 January 2015 at 19:39, Kalle Valo <kvalo@codeaurora.org> wrote: > Rafa? Mi?ecki <zajec5@gmail.com> writes: > >> On 7 January 2015 at 18:55, Kalle Valo <kvalo@codeaurora.org> wrote: >>> Oscar Forner Martinez <oscar.forner.martinez@gmail.com> writes: >>> >>>> Two lines with more than 80 characters per line have been split in several lines. >>>> >>>> Signed-off-by: Oscar Forner Martinez <oscar.forner.martinez@gmail.com> >>> >>> Thanks, applied to wireless-drivers-next.git. >> >> Could you still replace it (V4) with an older version (V3)? Before I >> explained V3 was OK Oscar already sent this (worse) V4. > > No. I'm not going to rebase a public git tree unless there's a huge > disaster. I was pretty sure you didn't push it yet, that's why I asked. > But if I see V4 I'm going to assume that's the one I need to apply, not > some older version. If V4 is not good for some reason, make it > ABSOLUTELY clear that I should not apply it. I do not want to start > guessing what patch I should apply. Yeah, it wasn't your fault of course. Oscar sent V4 too early and I didn't make things clear. Sorry.
Rafa? Mi?ecki <zajec5@gmail.com> writes: > On 7 January 2015 at 19:39, Kalle Valo <kvalo@codeaurora.org> wrote: >> Rafa? Mi?ecki <zajec5@gmail.com> writes: >> >>> On 7 January 2015 at 18:55, Kalle Valo <kvalo@codeaurora.org> wrote: >>>> Oscar Forner Martinez <oscar.forner.martinez@gmail.com> writes: >>>> >>>>> Two lines with more than 80 characters per line have been split in several lines. >>>>> >>>>> Signed-off-by: Oscar Forner Martinez <oscar.forner.martinez@gmail.com> >>>> >>>> Thanks, applied to wireless-drivers-next.git. >>> >>> Could you still replace it (V4) with an older version (V3)? Before I >>> explained V3 was OK Oscar already sent this (worse) V4. >> >> No. I'm not going to rebase a public git tree unless there's a huge >> disaster. > > I was pretty sure you didn't push it yet, that's why I asked. Heh, we got lucky. So I had actually run 'git push' but missed that the authenticate had failed. A good thing you pointed out this. So I know dropped this patch from my tree and pushed rest of the patches I had applied. Rafal, is this the patch I should apply: https://patchwork.kernel.org/patch/5545021/ Please confirm.
On 9 January 2015 at 15:03, Kalle Valo <kvalo@codeaurora.org> wrote: > Rafa? Mi?ecki <zajec5@gmail.com> writes: > >> On 7 January 2015 at 19:39, Kalle Valo <kvalo@codeaurora.org> wrote: >>> Rafa? Mi?ecki <zajec5@gmail.com> writes: >>> >>>> On 7 January 2015 at 18:55, Kalle Valo <kvalo@codeaurora.org> wrote: >>>>> Oscar Forner Martinez <oscar.forner.martinez@gmail.com> writes: >>>>> >>>>>> Two lines with more than 80 characters per line have been split in several lines. >>>>>> >>>>>> Signed-off-by: Oscar Forner Martinez <oscar.forner.martinez@gmail.com> >>>>> >>>>> Thanks, applied to wireless-drivers-next.git. >>>> >>>> Could you still replace it (V4) with an older version (V3)? Before I >>>> explained V3 was OK Oscar already sent this (worse) V4. >>> >>> No. I'm not going to rebase a public git tree unless there's a huge >>> disaster. >> >> I was pretty sure you didn't push it yet, that's why I asked. > > Heh, we got lucky. So I had actually run 'git push' but missed that the > authenticate had failed. A good thing you pointed out this. So I know > dropped this patch from my tree and pushed rest of the patches I had > applied. > > Rafal, is this the patch I should apply: > > https://patchwork.kernel.org/patch/5545021/ > > Please confirm. That's correct.
Rafa? Mi?ecki <zajec5@gmail.com> writes: >> Rafal, is this the patch I should apply: >> >> https://patchwork.kernel.org/patch/5545021/ >> >> Please confirm. > > That's correct. Thanks. I marked it as 'Under Review' in patchwork and will apply in my next commit round.
diff --git a/drivers/bcma/driver_chipcommon.c b/drivers/bcma/driver_chipcommon.c index 19f6796..ee5a172 100644 --- a/drivers/bcma/driver_chipcommon.c +++ b/drivers/bcma/driver_chipcommon.c @@ -97,7 +97,8 @@ int bcma_chipco_watchdog_register(struct bcma_drv_cc *cc) wdt.driver_data = cc; wdt.timer_set = bcma_chipco_watchdog_timer_set_wdt; wdt.timer_set_ms = bcma_chipco_watchdog_timer_set_ms_wdt; - wdt.max_timer_ms = bcma_chipco_watchdog_get_max_timer(cc) / cc->ticks_per_ms; + wdt.max_timer_ms = + bcma_chipco_watchdog_get_max_timer(cc) / cc->ticks_per_ms; pdev = platform_device_register_data(NULL, "bcm47xx-wdt", cc->core->bus->num, &wdt, @@ -335,7 +336,8 @@ void bcma_chipco_serial_init(struct bcma_drv_cc *cc) | BCMA_CC_CORECTL_UARTCLKEN); } } else { - bcma_err(cc->core->bus, "serial not supported on this device ccrev: 0x%x\n", ccrev); + bcma_err(cc->core->bus, "serial not supported on this device ccrev: 0x%x\n", + ccrev); return; }
Two lines with more than 80 characters per line have been split in several lines. Signed-off-by: Oscar Forner Martinez <oscar.forner.martinez@gmail.com> --- drivers/bcma/driver_chipcommon.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)