From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Bart Van Assche <bart.vanassche@gmail•com>,
"Nicholas A. Bellinger" <nab@linux-iscsi•org>
Cc: Linux-Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>
Subject: Re: linux-next: manual merge of the target-bva tree with the target-updates tree
Date: Fri, 2 Jun 2017 14:11:59 +1000 [thread overview]
Message-ID: <20170602141159.197ec84f@canb.auug.org.au> (raw)
In-Reply-To: <20170602140535.17d87d58@canb.auug.org.au>
Hi all,
On Fri, 2 Jun 2017 14:05:35 +1000 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the target-bva tree got a conflict in:
>
> drivers/target/target_core_tpg.c
>
> between commits:
>
> 06fd91ce633d ("target/configfs: Kill se_lun->lun_link_magic")
> 4f61e1e687c4 ("target: Avoid target_shutdown_sessions loop during queue_depth change")
>
> from the target-updates tree and commits:
>
> ba438d7c8d39 ("target: Avoid target_shutdown_sessions loop during queue_depth change")
> b968ec8ff101 ("target/configfs: Kill se_lun->lun_link_magic")
>
> from the target-bva tree.
>
> I fixed it up (I used the version from the target-updates tree) and can
Which turned out to be the wrong thing to do (or more was needed) as
the result does not build :-(.
I have just dropped the target-bva tree for today.
--
Cheers,
Stephen Rothwell
next prev parent reply other threads:[~2017-06-02 4:12 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-02 4:05 linux-next: manual merge of the target-bva tree with the target-updates tree Stephen Rothwell
2017-06-02 4:11 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2017-06-01 4:10 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
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
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=20170602141159.197ec84f@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=bart.vanassche@gmail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=nab@linux-iscsi$(echo .)org \
/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