From: David Miller <davem@davemloft.net>
To: sjur.brandeland@stericsson.com
Cc: netdev@vger.kernel.org, sjurbren@gmail.com
Subject: Re: [PATCH net-next] caif-hsi: Fix merge issues.
Date: Fri, 29 Jun 2012 00:48:20 -0700 (PDT) [thread overview]
Message-ID: <20120629.004820.1610791486901428775.davem@davemloft.net> (raw)
In-Reply-To: <1340951780-27406-1-git-send-email-sjur.brandeland@stericsson.com>
From: sjur.brandeland@stericsson.com
Date: Fri, 29 Jun 2012 08:36:20 +0200
> From: Sjur Brændeland <sjur.brandeland@stericsson.com>
>
> Fix the failing merge in net-next by reverting the last
> net-next merge for caif_hsi.c and then merge in the commit:
> "caif-hsi: Bugfix - Piggyback'ed embedded CAIF frame lost"
> from the net repository.
>
> The commit:"caif-hsi: Add missing return in error path" from
> net repository was dropped, as it changed code previously removed in the
> net-next repository.
>
> Signed-off-by: Sjur Brændeland <sjur.brandeland@stericsson.com>
Applied, thanks a lot.
prev parent reply other threads:[~2012-06-29 7:48 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-29 6:36 [PATCH net-next] caif-hsi: Fix merge issues sjur.brandeland
2012-06-29 7:48 ` David Miller [this message]
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=20120629.004820.1610791486901428775.davem@davemloft.net \
--to=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
--cc=sjur.brandeland@stericsson.com \
--cc=sjurbren@gmail.com \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox