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, Al Viro <viro@zeniv.linux.org.uk>, Nathan Zimmer <nzimmer@sgi.com> Subject: linux-next: manual merge of the akpm tree with the vfs tree Date: Thu, 4 Apr 2013 17:04:14 +1100 [thread overview] Message-ID: <20130404170414.33181fd7ba8e17a6b662b200@canb.auug.org.au> (raw) [-- Attachment #1: Type: text/plain, Size: 528 bytes --] Hi Andrew, Today's linux-next merge of the akpm tree got a conflict in sound/core/info.c between commit d1ffe1db6641 ("snd_info_register: switch to proc_create_data/proc_mkdir_mode") from the vfs tree and commit "sound: convert snd_info_register() to use proc_create_data()" from the akpm tree. It looks like they are trying to do the same thing, so I dropped the akpm tree version and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell sfr@canb.auug.org.au [-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2013-04-04 6:04 UTC|newest] Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top 2013-04-04 6:04 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-09-05 8:56 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-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=20130404170414.33181fd7ba8e17a6b662b200@canb.auug.org.au \ --to=sfr@canb.auug.org.au \ --cc=akpm@linux-foundation.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-next@vger.kernel.org \ --cc=nzimmer@sgi.com \ --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).