On 2012-09-21 09:07, Eric W. Biederman wrote: > Jens Axboe <jaxboe@xxxxxxxxxxxx> writes: > >> On 2012-09-21 02:28, Eric W. Biederman wrote: >>> From: "Eric W. Biederman" <ebiederm@xxxxxxxxxxxx> >>> >>> Cc: Signed-off-by: Jens Axboe <jaxboe@xxxxxxxxxxxx> >>> Acked-by: Serge Hallyn <serge.hallyn@xxxxxxxxxxxxx> >>> Signed-off-by: Eric W. Biederman <ebiederm@xxxxxxxxxxxx> >>> --- >>> drivers/block/loop.c | 4 ++-- >>> include/linux/loop.h | 2 +- >>> init/Kconfig | 1 - >>> 3 files changed, 3 insertions(+), 4 deletions(-) >> >> Thanks Eric, queued for 3.7. > > Would it be a problem if I also merged throug my user-namespace.git tree? > > That was the original plan and it is handy to keep all of the patches > together. > > Not that it matters much in this case. Not at all, go ahead. It'll be trivial to resolve any merge conflict due to this. BTW, this: Cc: Signed-off-by: Jens Axboe <jaxboe@xxxxxxxxxxxx> in your original patch needs fixing up. I'm assuming it's a copy-paste error and meant to be a Cc, since I haven't signed-off on it. -- Jens Axboe _______________________________________________ Containers mailing list Containers@xxxxxxxxxxxxxxxxxxxxxxxxxx https://lists.linuxfoundation.org/mailman/listinfo/containers
