lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Sat, 15 Dec 2012 14:28:59 -0800 From: Linus Torvalds <torvalds@...ux-foundation.org> To: "Nicholas A. Bellinger" <nab@...ux-iscsi.org> Cc: target-devel <target-devel@...r.kernel.org>, linux-scsi <linux-scsi@...r.kernel.org>, LKML <linux-kernel@...r.kernel.org>, Christoph Hellwig <hch@....de>, Roland Dreier <roland@...nel.org>, Sebastian Andrzej Siewior <bigeasy@...utronix.de> Subject: Re: [GIT PULL] target updates for v3.8-rc1 On Fri, Dec 14, 2012 at 3:53 PM, Nicholas A. Bellinger <nab@...ux-iscsi.org> wrote: > > Here are the target updates for v3.8-rc1 merge window code. Please go > ahead and pull from: > > git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git for-next > > Just a heads up that there is a minor merge conflict that you'll > encounter in target_handle_task_attr() code, that sfr has been carrying > a fix for recently within -next. After dropping the HEAD section, the > resolution should look like: Hmm. This is *not* how I resolved that conflict - that seems to drop the new complete(&cmd->t_transport_stop_comp); added by Roland in commit 3ea160b3e8f0 ("target: Fix handling of aborted commands"). So my conflict resolution looks different. Which may be a bug, of course. Nicholas, Roland, please check my end result, Linus -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists