From: Bart Van Assche <Bart.VanAssche@sandisk•com>
To: "sfr@canb•auug.org.au" <sfr@canb•auug.org.au>,
"nab@linux-iscsi•org" <nab@linux-iscsi•org>
Cc: "linux-kernel@vger•kernel.org" <linux-kernel@vger•kernel.org>,
"linux-next@vger•kernel.org" <linux-next@vger•kernel.org>
Subject: Re: linux-next: manual merge of the target-bva tree with the target-updates tree
Date: Thu, 1 Jun 2017 04:59:40 +0000 [thread overview]
Message-ID: <1496293179.16453.1.camel@sandisk.com> (raw)
In-Reply-To: <20170601141055.3b64fefc@canb.auug.org.au>
On Thu, 2017-06-01 at 14:10 +1000, Stephen Rothwell wrote:
> Hi Bart,
>
> Today's linux-next merge of the target-bva tree got a conflict in:
>
> drivers/target/target_core_transport.c
>
> between commit:
>
> 4ff83daa0200 ("target: Re-add check to reject control WRITEs with overflow data")
>
> from the target-updates tree and commit:
>
> 2c66660df665 ("target: Fix overflow/underflow handling of commands with a Data-Out buffer")
>
> from the target-bva tree.
>
> I fixed it up (I think (guidance appreciated), see below) and can
> carry the fix as necessary. This is now fixed as far as linux-next is
> concerned, but any non trivial conflicts should be mentioned to your
> upstream maintainer when your tree is submitted for merging. You may
> also want to consider cooperating with the maintainer of the conflicting
> tree to minimise any particularly complex conflicts.
Hello Stephen,
Thanks for having fixed this up. I hadn't noticed that Nic had queued up patches
that conflict with my patches. I will rebase my tree.
Bart.
next prev parent reply other threads:[~2017-06-01 4:59 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-01 4:10 linux-next: manual merge of the target-bva tree with the target-updates tree Stephen Rothwell
2017-06-01 4:27 ` Nicholas A. Bellinger
2017-06-01 5:05 ` Bart Van Assche
2017-06-01 5:15 ` Nicholas A. Bellinger
2017-06-01 4:59 ` Bart Van Assche [this message]
2017-06-01 5:04 ` Nicholas A. Bellinger
2017-06-01 21:14 ` Bart Van Assche
2017-06-01 23:28 ` Stephen Rothwell
2017-06-02 3:58 ` Nicholas A. Bellinger
-- strict thread matches above, loose matches on Subject: below --
2017-06-02 4:05 Stephen Rothwell
2017-06-02 4:11 ` Stephen Rothwell
2017-02-20 2:51 Stephen Rothwell
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=1496293179.16453.1.camel@sandisk.com \
--to=bart.vanassche@sandisk$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=nab@linux-iscsi$(echo .)org \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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