From: Stephen Rothwell <sfr@canb•auug.org.au>
To: "Nicholas A. Bellinger" <nab@linux-iscsi•org>, Tejun Heo <tj@kernel•org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Sagi Grimberg <sagig@mellanox•com>
Subject: linux-next: manual merge of the target-updates tree with the libata tree
Date: Tue, 4 Aug 2015 13:35:46 +1000 [thread overview]
Message-ID: <20150804133546.66badb66@canb.auug.org.au> (raw)
Hi Nicholas,
Today's linux-next merge of the target-updates tree got a conflict in:
drivers/ata/libata-scsi.c
between commit:
fe16d4f202c5 ("Revert "libata-eh: Set 'information' field for autosense"")
from the libata tree and commit:
f5a8b3a796db ("scsi: Protect against buffer possible overflow in scsi_set_sense_information")
from the target-updates tree.
I fixed it up (the former removed some code that was updated by the
latter, so I just removed the code) and can carry the fix as necessary
(no action is required).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
next reply other threads:[~2015-08-04 3:35 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-04 3:35 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2015-08-04 3:35 linux-next: manual merge of the target-updates tree with the libata tree 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=20150804133546.66badb66@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=nab@linux-iscsi$(echo .)org \
--cc=sagig@mellanox$(echo .)com \
--cc=tj@kernel$(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