Messages in this thread | | | Subject | Re: [GIT PULL-v2] iscsi-target merge for v3.1-rc1 | From | "Nicholas A. Bellinger" <> | Date | Wed, 27 Jul 2011 15:48:31 -0700 |
| |
On Tue, 2011-07-26 at 19:13 -0700, Nicholas A. Bellinger wrote: > Hi Linus, > > Here is an updated pull request for an initial v3.1-rc1 merge of > iscsi_target including the updates to address some recent build breakage > with iscsi_proto.h in linux-next, and minor build warnings on 32-bit. > > This also includes the DIV_ROUND_UP_SECTOR_T bit and associated change > for targte_core_mod from this morning that address the 32-bit unsigned > long long division build issues as per your direction on LKML. This can > definately use some more discussion and testing in linux-next, so please > let me know if how you prefer to merge these. > > The series is available directly here: > > master.kernel.org:/pub/scm/linux/kernel/git/nab/target-pending.git for-next > > This tree is also available from kernel.org mirrors at: > > git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git for-next > > The series is based on the following mainline HEAD: > > commit bbd9d6f7fbb0305c9a592bf05a32e87eb364a4ff > Merge: 8e20487 5a9a436 > Author: Linus Torvalds <torvalds@linux-foundation.org> > Date: Fri Jul 22 19:02:39 2011 -0700 > > Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6 > > Also just double checking, here the for-next branch is merge conflict > free on yesterdays linux-next (20110725), and latest mainline HEAD from > afternoon. > > Thank you, >
Hi Linus,
Thank you for pulling in iscsi-target for an initial v3.1 merge!
The for-next branch has been updated to address this morning's reported items with Dan's fixes and Randy's CONFIG_SMP=n + CONFIG_MODULES=n build breakage.
I'll keep queueing up v3.1-rc1 bugfixes in for-next and will follow up with a fixes-only pull request early next week, unless of course you want it earlier than that. :)
Thanks again, and please let us know if you have any concerns,
--nab
| |