* linux-next: manual merge of the akpm tree with the slab tree
@ 2011-09-14 6:24 Stephen Rothwell
2011-09-14 6:35 ` Pekka Enberg
0 siblings, 1 reply; 5+ messages in thread
From: Stephen Rothwell @ 2011-09-14 6:24 UTC (permalink / raw)
To: Andrew Morton
Cc: linux-next, linux-kernel, Dave Jones, Sebastian Andrzej Siewior,
Pekka Enberg, Christoph Lameter
Hi Andrew,
Today's linux-next merge of the scsi-post-merge tree got a conflict in
mm/slab.c between commit fdde6abb3e8d ("slab: use print_hex_dump") from
the slab tree and commit 0cf5ab251a1a ("When we get corruption reports,
it's useful to see if the kernel was") from the akpm tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc mm/slab.c
index 5bfc204,10a3624..0000000
--- a/mm/slab.c
+++ b/mm/slab.c
@@@ -3037,11 -3037,16 +3037,11 @@@ static void check_slabp(struct kmem_cac
if (entries != cachep->num - slabp->inuse) {
bad:
printk(KERN_ERR "slab: Internal list corruption detected in "
- "cache '%s'(%d), slabp %p(%d). Hexdump:\n",
- cachep->name, cachep->num, slabp, slabp->inuse);
+ "cache '%s'(%d), slabp %p(%d). Tainted(%s). Hexdump:\n",
+ cachep->name, cachep->num, slabp, slabp->inuse, print_tainted());
- for (i = 0;
- i < sizeof(*slabp) + cachep->num * sizeof(kmem_bufctl_t);
- i++) {
- if (i % 16 == 0)
- printk("\n%03x:", i);
- printk(" %02x", ((unsigned char *)slabp)[i]);
- }
- printk("\n");
+ print_hex_dump(KERN_ERR, "", DUMP_PREFIX_OFFSET, 16, 1, slabp,
+ sizeof(*slabp) + cachep->num * sizeof(kmem_bufctl_t),
+ 1);
BUG();
}
}
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: linux-next: manual merge of the akpm tree with the slab tree
2011-09-14 6:24 linux-next: manual merge of the akpm tree with the slab tree Stephen Rothwell
@ 2011-09-14 6:35 ` Pekka Enberg
0 siblings, 0 replies; 5+ messages in thread
From: Pekka Enberg @ 2011-09-14 6:35 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Andrew Morton, linux-next, linux-kernel, Dave Jones,
Sebastian Andrzej Siewior, Christoph Lameter
On Wed, Sep 14, 2011 at 9:24 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Andrew,
>
> Today's linux-next merge of the scsi-post-merge tree got a conflict in
> mm/slab.c between commit fdde6abb3e8d ("slab: use print_hex_dump") from
> the slab tree and commit 0cf5ab251a1a ("When we get corruption reports,
> it's useful to see if the kernel was") from the akpm tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.
Andrew, if you send me the patch to penberg@cs.helsinki.fi, I can fix
up the conflict and carry it in my tree.
Pekka
^ permalink raw reply [flat|nested] 5+ messages in thread
* linux-next: manual merge of the akpm tree with the slab tree
@ 2012-08-17 4:55 Stephen Rothwell
0 siblings, 0 replies; 5+ messages in thread
From: Stephen Rothwell @ 2012-08-17 4:55 UTC (permalink / raw)
To: Andrew Morton
Cc: linux-next, linux-kernel, Shuah Khan, Pekka Enberg, Christoph Lameter
[-- Attachment #1: Type: text/plain, Size: 463 bytes --]
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in
mm/slab_common.c between commit 77be4b1366c9 ("mm/slab: restructure
kmem_cache_create() debug checks") from the slab tree and commit
"mm/slab_common.c: cleanup" from the akpm tree.
Given that this akpm tree patch was applied to and then reverted from the
slab tree, I have just dropped it from the akpm tree.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: linux-next: manual merge of the akpm tree with the slab tree
2011-09-28 9:01 Stephen Rothwell
@ 2011-09-28 9:10 ` Vasiliy Kulikov
0 siblings, 0 replies; 5+ messages in thread
From: Vasiliy Kulikov @ 2011-09-28 9:10 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Andrew Morton, linux-next, linux-kernel, Pekka Enberg, Christoph Lameter
On Wed, Sep 28, 2011 at 19:01 +1000, Stephen Rothwell wrote:
> Hi Andrew,
>
> Today's linux-next merge of the akpm tree got a conflict in mm/slab.c
> between commit ab067e99d22e ("mm: restrict access to slab files under
> procfs and sysfs") from the slab tree and commit ea14c46ee4d9 ("mm:
> restrict access to /proc/slabinfo") from the akpm tree.
>
> The former is a superset of the latter, so I dropped that patch from the
> akpm tree.
Oops, sorry, Andrew, I would send the patch with /sys/kernel/slab/ only
if I knew that you've picked the first patch (I didn't receive a tip).
Where does -mm tree lives now?
Thanks,
--
Vasiliy Kulikov
http://www.openwall.com - bringing security into open computing environments
^ permalink raw reply [flat|nested] 5+ messages in thread
* linux-next: manual merge of the akpm tree with the slab tree
@ 2011-09-28 9:01 Stephen Rothwell
2011-09-28 9:10 ` Vasiliy Kulikov
0 siblings, 1 reply; 5+ messages in thread
From: Stephen Rothwell @ 2011-09-28 9:01 UTC (permalink / raw)
To: Andrew Morton
Cc: linux-next, linux-kernel, Vasiliy Kulikov, Pekka Enberg,
Christoph Lameter
[-- Attachment #1: Type: text/plain, Size: 477 bytes --]
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in mm/slab.c
between commit ab067e99d22e ("mm: restrict access to slab files under
procfs and sysfs") from the slab tree and commit ea14c46ee4d9 ("mm:
restrict access to /proc/slabinfo") from the akpm tree.
The former is a superset of the latter, so I dropped that patch from the
akpm tree.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2012-08-17 4:55 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-09-14 6:24 linux-next: manual merge of the akpm tree with the slab tree Stephen Rothwell
2011-09-14 6:35 ` Pekka Enberg
2011-09-28 9:01 Stephen Rothwell
2011-09-28 9:10 ` Vasiliy Kulikov
2012-08-17 4:55 Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).