Re: [GIT PULL] kmemcheck fixes for -tip

[Ingo Molnar]

* Vegard Nossum <vegard.nossum@xxxxxxxxx> wrote:

> Hi,
> 
> These are the patches I posted to LKML a while ago. Full diff included.
> 
> With this, we should be able to resume linux-next integration. It also gets
> rid of the two most frequent false positives, so automatic testing should be
> more useful.
> 
> The following changes since commit 12d77a12affc8310e09598fb5a35605549eb9730:
>   Ingo Molnar (1):
>         Merge commit 'v2.6.30-rc5' into kmemcheck
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/vegard/kmemcheck.git for-tip
> 
> Vegard Nossum (5):
>       kmemcheck: make bitfield annotations be valid C
>       fs: introduce __getname_gfp()
>       kmemcheck: add __GFP_NOTRACK_FALSE_POSITIVE flag
>       kmemcheck: fix do_mount_root() false positive
>       kmemcheck: fix __send_signal() false positive
>
>  drivers/ieee1394/csr1212.c       |    2 +-
>  drivers/ieee1394/nodemgr.c       |    8 ++--
>  drivers/misc/c2port/core.c       |    2 +-
>  include/linux/c2port.h           |    8 ++--
>  include/linux/fs.h               |    5 +-
>  include/linux/gfp.h              |    6 +++
>  include/linux/kmemcheck.h        |   91 +++++++++++++++++++------------------
>  include/linux/ring_buffer.h      |    6 +-
>  include/linux/skbuff.h           |   34 +++++++-------
>  include/net/inet_sock.h          |   22 +++++-----
>  include/net/inet_timewait_sock.h |   12 +++---
>  include/net/sock.h               |   10 ++--
>  init/do_mounts.c                 |    3 +-
>  kernel/signal.c                  |   11 +++-
>  kernel/trace/ring_buffer.c       |    4 +-
>  net/core/skbuff.c                |   12 +++---
>  net/core/sock.c                  |    2 +-
>  net/ipv4/inet_timewait_sock.c    |    2 +-
>  18 files changed, 128 insertions(+), 112 deletions(-)

Pulled, thanks Vegard! There were a few conflicts with tip:master, 
due to ongoing work in other areas:

    Merge branch 'kmemcheck'
    
    Conflicts:
        include/linux/ring_buffer.h
        init/do_mounts.c
        kernel/trace/ring_buffer.c

I resolved them manually, you might want to double check them.

	Ingo
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/