2013-12-02_14_14_43

From git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
 * branch            master     -> FETCH_HEAD
Already up-to-date.

commit af91706d5ddecb4a9858cca9e90d463037cfd498
Author: Roberto Sassu <roberto.sassu@polito.it>
Date:   Wed Nov 27 14:40:41 2013 +0100

    ima: store address of template_fmt_copy in a pointer before calling strsep
    
    This patch stores the address of the 'template_fmt_copy' variable in a new
    variable, called 'template_fmt_ptr', so that the latter is passed as an
    argument of strsep() instead of the former. This modification is needed
    in order to correctly free the memory area referenced by
    'template_fmt_copy' (strsep() modifies the pointer of the passed string).
    
    Signed-off-by: Roberto Sassu <roberto.sassu@polito.it>
    Reported-by: Sebastian Ott <sebott@linux.vnet.ibm.com>
    Signed-off-by: Mimi Zohar <zohar@us.ibm.com>
    Signed-off-by: James Morris <james.l.morris@oracle.com>

kernel/time/Kconfig:162:warning: range is invalid
#
# configuration written to .config
#
kernel/time/Kconfig:162:warning: range is invalid
#
# configuration written to .config
#

scripts/kconfig/conf --silentoldconfig Kconfig
kernel/time/Kconfig:162:warning: range is invalid
  CHK     include/config/kernel.release
  CHK     include/generated/uapi/linux/version.h
  UPD     include/generated/uapi/linux/version.h
  HOSTCC  scripts/dtc/checks.o
  HOSTCC  scripts/dtc/data.o
  SHIPPED scripts/dtc/dtc-lexer.lex.c
  SHIPPED scripts/dtc/dtc-parser.tab.h
  SHIPPED scripts/dtc/dtc-parser.tab.c
  HOSTCC  scripts/dtc/dtc.o
  HOSTCC  scripts/dtc/flattree.o
  HOSTCC  scripts/dtc/fstree.o
  HOSTCC  scripts/dtc/livetree.o
  HOSTCC  scripts/dtc/srcpos.o
  HOSTCC  scripts/dtc/treesource.o
  HOSTCC  scripts/dtc/util.o
  HOSTCC  scripts/dtc/dtc-lexer.lex.o
  HOSTCC  scripts/dtc/dtc-parser.tab.o
  HOSTLD  scripts/dtc/dtc
  CC      scripts/mod/empty.o
  HOSTCC  scripts/mod/mk_elfconfig
  CC      scripts/mod/devicetable-offsets.s
  MKELF   scripts/mod/elfconfig.h
  GEN     scripts/mod/devicetable-offsets.h
  HOSTCC  scripts/mod/modpost.o
  HOSTCC  scripts/mod/sumversion.o
  HOSTCC  scripts/mod/file2alias.o
  HOSTLD  scripts/mod/modpost
  HOSTCC  scripts/kallsyms
  HOSTCC  scripts/bin2c
  UPD     include/config/kernel.release
  CHK     include/generated/utsrelease.h
  UPD     include/generated/utsrelease.h
  CC      kernel/bounds.s

Switched to branch 'master'
Deleted branch next (was ae5be52).
From git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
 * branch            master     -> FETCH_HEAD
Already up-to-date.
From ../linux-2.6
 * branch            HEAD       -> FETCH_HEAD
Already up-to-date.
error: Ref refs/remotes/linux-next/akpm is at 7902515df478e6094bae6fc0bf5ea559e12fa31d but expected 4e6352224af50e299c8d07564d44d175441cf382
From git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next
 ! 4e63522...7902515 akpm       -> linux-next/akpm  (unable to update local ref)
error: Ref refs/remotes/linux-next/akpm-base is at 764af004bba2f9ab57ea5351bbbdf416d515cfc4 but expected 05887a3fa57d3effd7fa114ffcb2c413cb25a31a
 ! 05887a3...764af00 akpm-base  -> linux-next/akpm-base  (unable to update local ref)
error: Ref refs/remotes/linux-next/master is at 4740c3016fc0109d6fad8a0d182823635fce1f25 but expected ae5be5235775f92eac68cc254bd29334028d2720
 ! ae5be52...4740c30 master     -> linux-next/master  (unable to update local ref)
error: Ref refs/remotes/linux-next/stable is at af91706d5ddecb4a9858cca9e90d463037cfd498 but expected dda9cc3a14518fcf8a89faef15f0f704de3533f2
 ! dda9cc3..af91706  stable     -> linux-next/stable  (unable to update local ref)
 * [neFetching linux-next
Switched to a new branch 'next'
Branch next set up to track remote branch master from linux-next.
ts/automated_tests/linux-next/.git/index.lock': File exists.

If no other git process is currently running, this probably means a
git process crashed in this repository earlier. Make sure no other git
process is running and remove the file manually to continue.

commit 4740c3016fc0109d6fad8a0d182823635fce1f25
Author: Stephen Rothwell <sfr@canb.auug.org.au>
Date:   Mon Dec 2 16:18:44 2013 +1100

    Add linux-next specific files for 20131202
    
    Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

  HOSTCC  scripts/basic/fixdep
  HOSTCC  scripts/kconfig/conf.o
  SHIPPED scripts/kconfig/zconf.tab.c
  SHIPPED scripts/kconfig/zconf.lex.c
  SHIPPED scripts/kconfig/zconf.hash.c
  HOSTCC  scripts/kconfig/zconf.tab.o
  HOSTLD  scripts/kconfig/conf
kernel/time/Kconfig:162:warning: range is invalid
#
# configuration written to .config
#