All of lore.kernel.org
 help / color / mirror / Atom feed
* linux-next: manual merge of the akpm tree with the vfs tree
@ 2013-04-04  6:26 Stephen Rothwell
  2013-04-04  6:56 ` Andrew Morton
  0 siblings, 1 reply; 33+ messages in thread
From: Stephen Rothwell @ 2013-04-04  6:26 UTC (permalink / raw)
  To: Andrew Morton; +Cc: linux-next, linux-kernel, Al Viro, Nathan Zimmer

[-- Attachment #1: Type: text/plain, Size: 407 bytes --]

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
fs/proc/generic.c between several commits from the vfs tree and commit
"procfs: improve scaling in proc" from the akpm tree.

I just dropped the akpm tree patch (and the following
"procfs-improve-scaling-in-proc-v5") as the conflicts are a bit complex.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 33+ messages in thread
* Re: hangs on boot in 9984d7394618df9
@ 2013-04-10 10:44 Sedat Dilek
  0 siblings, 0 replies; 33+ messages in thread
From: Sedat Dilek @ 2013-04-10 10:44 UTC (permalink / raw)
  To: linux-next; +Cc: LKML, Al Viro, Stephen Rothwell

The issue is fixed with Linux-Next (next-20130410).

- Sedat -

[1] http://marc.info/?l=linux-next&m=136559043516192&w=2

^ permalink raw reply	[flat|nested] 33+ messages in thread

end of thread, other threads:[~2013-04-10 10:44 UTC | newest]

Thread overview: 33+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-04-04  6:26 linux-next: manual merge of the akpm tree with the vfs tree Stephen Rothwell
2013-04-04  6:56 ` Andrew Morton
2013-04-04  7:02   ` Andrew Morton
2013-04-04  8:10     ` Al Viro
2013-04-04 23:18       ` Stephen Rothwell
2013-04-04  8:02   ` Al Viro
2013-04-04 15:43     ` Nathan Zimmer
2013-04-04 15:43       ` Nathan Zimmer
2013-04-04 15:53       ` [PATCH resend] fs/proc: Move kfree outside pde_unload_lock Nathan Zimmer
2013-04-04 16:11         ` Al Viro
2013-04-04 17:12           ` Nathan Zimmer
2013-04-04 20:44             ` Al Viro
2013-04-05 17:05               ` Nathan Zimmer
2013-04-05 17:36                 ` Al Viro
2013-04-05 20:56                   ` Nathan Zimmer
2013-04-05 21:00                     ` Al Viro
2013-04-08 15:34                       ` Nathan Zimmer
2013-04-08 15:58                         ` Al Viro
2013-04-08 16:42                           ` Nathan Zimmer
2013-04-08 20:52                           ` Nathan Zimmer
2013-04-08 21:23                             ` Al Viro
2013-04-08 21:48                               ` hangs on boot in 9984d7394618df9 Al Viro
2013-04-08 22:17                                 ` Stephen Warren
2013-04-08 22:45                                   ` Doug Anderson
2013-04-08 23:06                                     ` Al Viro
2013-04-08 23:20                                       ` Stephen Warren
2013-04-08 23:46                                       ` Doug Anderson
2013-04-09 17:12                                         ` Nathan Zimmer
2013-04-09 17:12                                           ` Nathan Zimmer
2013-04-08 22:46                                   ` Al Viro
2013-04-08 22:57                                     ` Al Viro
2013-04-08 21:56                               ` [PATCH resend] fs/proc: Move kfree outside pde_unload_lock Nathan Zimmer
  -- strict thread matches above, loose matches on Subject: below --
2013-04-10 10:44 hangs on boot in 9984d7394618df9 Sedat Dilek

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.