Re: linux-next: manual merge of the target-bva tree with the target-updates tree

2017-06-01 Thread Stephen Rothwell
Hi all, On Fri, 2 Jun 2017 14:05:35 +1000 Stephen Rothwell 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: A

linux-next: manual merge of the target-bva tree with the target-updates tree

2017-06-01 Thread Stephen Rothwell
Hi Bart, 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 tar

Re: linux-next: manual merge of the target-bva tree with the target-updates tree

2017-06-01 Thread Nicholas A. Bellinger
On Thu, 2017-06-01 at 14:14 -0700, Bart Van Assche wrote: > On 05/31/17 22:04, Nicholas A. Bellinger wrote: > > Go ahead and get list review on drivers/target/ changes before pushing > > them into linux-next, please. > > > > Btw, I don't care if you queue up one's that do have at least two > > Rev

Re: linux-next: manual merge of the target-bva tree with the target-updates tree

2017-06-01 Thread Stephen Rothwell
Hi Bart, On Thu, 1 Jun 2017 14:14:06 -0700 Bart Van Assche wrote: > > On 05/31/17 22:04, Nicholas A. Bellinger wrote: > > Go ahead and get list review on drivers/target/ changes before pushing > > them into linux-next, please. > > > > Btw, I don't care if you queue up one's that do have at leas

Re: linux-next: manual merge of the target-bva tree with the target-updates tree

2017-06-01 Thread Bart Van Assche
On 05/31/17 22:04, Nicholas A. Bellinger wrote: > Go ahead and get list review on drivers/target/ changes before pushing > them into linux-next, please. > > Btw, I don't care if you queue up one's that do have at least two > Reviewed-bys into your tree, but everything that doesn't have > Reviewed-

Re: linux-next: manual merge of the target-bva tree with the target-updates tree

2017-05-31 Thread Nicholas A. Bellinger
On Thu, 2017-06-01 at 05:05 +, Bart Van Assche wrote: > On Wed, 2017-05-31 at 21:27 -0700, Nicholas A. Bellinger wrote: > > but a weeks worth of list silence for your series doesn't mean > > you're free to push un-reviewed stuff for drivers/target/ into > > linux-next. > > I think this is an e

Re: linux-next: manual merge of the target-bva tree with the target-updates tree

2017-05-31 Thread Bart Van Assche
On Wed, 2017-05-31 at 21:27 -0700, Nicholas A. Bellinger wrote: > but a weeks worth of list silence for your series doesn't mean > you're free to push un-reviewed stuff for drivers/target/ into > linux-next. I think this is an example of the pot calling the kettle black. Your patch "target: Re-add

Re: linux-next: manual merge of the target-bva tree with the target-updates tree

2017-05-31 Thread Nicholas A. Bellinger
On Thu, 2017-06-01 at 04:59 +, Bart Van Assche wrote: > 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: > > > > 4ff83

Re: linux-next: manual merge of the target-bva tree with the target-updates tree

2017-05-31 Thread Bart Van Assche
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"

Re: linux-next: manual merge of the target-bva tree with the target-updates tree

2017-05-31 Thread Nicholas A. Bellinger
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"

linux-next: manual merge of the target-bva tree with the target-updates tree

2017-05-31 Thread Stephen Rothwell
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: 2c0df665 ("target: Fix overf

linux-next: manual merge of the target-bva tree with the target-updates tree

2017-02-19 Thread Stephen Rothwell
Hi Bart, Today's linux-next merge of the target-bva tree got conflicts in: drivers/target/iscsi/cxgbit/cxgbit_target.c drivers/target/iscsi/iscsi_target.c include/target/iscsi/iscsi_transport.h between commits: 9a584bf9bf0a ("target/iscsi: split iscsit_check_dataout_hdr()") 79e57cfe00