From: Stephen Rothwell <sfr@canb.auug.org.au> To: Andrew Morton <akpm@linux-foundation.org> Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Dave Chinner <dchinner@redhat.com>, Christoph Hellwig <hch@infradead.org>, Al Viro <viro@ZenIV.linux.org.uk> Subject: linux-next: manual merge of the akpm tree with the vfs tree Date: Thu, 5 Sep 2013 18:56:49 +1000 [thread overview] Message-ID: <20130905185649.0dce2b5824f7a3fb355234c2@canb.auug.org.au> (raw) [-- Attachment #1: Type: text/plain, Size: 1123 bytes --] Hi Andrew, Today's linux-next merge of the akpm tree got a conflict in include/linux/fs.h between commit 7b7a8665edd8 ("direct-io: Implement generic deferred AIO completions") from the vfs tree and commit "dcache: convert to use new lru list infrastructure" from the akpm tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell sfr@canb.auug.org.au diff --cc include/linux/fs.h index ee1a9b2,b778968..0000000 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@@ -1421,8 -1413,12 +1413,15 @@@ struct super_block /* Being remounted read-only */ int s_readonly_remount; + /* AIO completions deferred from interrupt context */ + struct workqueue_struct *s_dio_done_wq; ++ + /* + * Keep the lru lists last in the structure so they always sit on their + * own individual cachelines. + */ + struct list_lru s_dentry_lru ____cacheline_aligned_in_smp; + struct list_lru s_inode_lru ____cacheline_aligned_in_smp; }; extern struct timespec current_fs_time(struct super_block *sb); [-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2013-09-05 8:57 UTC|newest] Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top 2013-09-05 8:56 Stephen Rothwell [this message] -- strict thread matches above, loose matches on Subject: below -- 2020-05-15 11:33 Stephen Rothwell 2019-04-11 6:21 Stephen Rothwell 2018-05-17 6:36 Stephen Rothwell 2018-01-02 6:46 Stephen Rothwell 2016-12-12 5:52 Stephen Rothwell 2016-12-12 8:14 ` Ian Kent 2014-08-08 6:20 Stephen Rothwell 2013-09-10 4:41 Stephen Rothwell 2013-04-30 5:54 Stephen Rothwell 2013-04-29 8:34 Stephen Rothwell 2013-04-29 8:25 Stephen Rothwell 2013-04-04 6:26 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 6:17 Stephen Rothwell 2013-04-04 6:12 Stephen Rothwell 2013-04-04 12:33 ` Jan Kara 2013-04-04 6:04 Stephen Rothwell 2013-02-25 3:40 Stephen Rothwell 2012-09-24 13:40 Stephen Rothwell 2012-09-24 13:12 Stephen Rothwell 2012-09-24 13:06 Stephen Rothwell 2012-07-22 5:44 Stephen Rothwell 2011-07-18 8:55 Stephen Rothwell
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20130905185649.0dce2b5824f7a3fb355234c2@canb.auug.org.au \ --to=sfr@canb.auug.org.au \ --cc=akpm@linux-foundation.org \ --cc=dchinner@redhat.com \ --cc=hch@infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-next@vger.kernel.org \ --cc=viro@ZenIV.linux.org.uk \ --subject='Re: linux-next: manual merge of the akpm tree with the vfs tree' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
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).