From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933638AbcKVRrm (ORCPT ); Tue, 22 Nov 2016 12:47:42 -0500 Received: from out02.mta.xmission.com ([166.70.13.232]:58238 "EHLO out02.mta.xmission.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933216AbcKVRra (ORCPT ); Tue, 22 Nov 2016 12:47:30 -0500 From: ebiederm@xmission.com (Eric W. Biederman) To: Stephen Rothwell Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Lorenzo Stoakes References: <20161122191719.3e438d1e@canb.auug.org.au> Date: Tue, 22 Nov 2016 11:44:25 -0600 In-Reply-To: <20161122191719.3e438d1e@canb.auug.org.au> (Stephen Rothwell's message of "Tue, 22 Nov 2016 19:17:19 +1100") Message-ID: <87r363h0jq.fsf@xmission.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-XM-SPF: eid=1c9FA0-0005JP-KS;;;mid=<87r363h0jq.fsf@xmission.com>;;;hst=in02.mta.xmission.com;;;ip=75.170.125.99;;;frm=ebiederm@xmission.com;;;spf=neutral X-XM-AID: U2FsdGVkX18mMkRZk0Qp75m7nwT3EvZorXMul2upyxc= X-SA-Exim-Connect-IP: 75.170.125.99 X-SA-Exim-Mail-From: ebiederm@xmission.com X-Spam-Report: * -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP * 0.0 TVD_RCVD_IP Message was received from an IP address * 0.7 XMSubLong Long Subject * 0.0 T_TM2_M_HEADER_IN_MSG BODY: No description available. * 0.8 BAYES_50 BODY: Bayes spam probability is 40 to 60% * [score: 0.4417] * -0.0 DCC_CHECK_NEGATIVE Not listed in DCC * [sa04 1397; Body=1 Fuz1=1 Fuz2=1] X-Spam-DCC: XMission; sa04 1397; Body=1 Fuz1=1 Fuz2=1 X-Spam-Combo: ;Stephen Rothwell X-Spam-Relay-Country: X-Spam-Timing: total 5549 ms - load_scoreonly_sql: 0.05 (0.0%), signal_user_changed: 2.9 (0.1%), b_tie_ro: 1.99 (0.0%), parse: 0.97 (0.0%), extract_message_metadata: 15 (0.3%), get_uri_detail_list: 1.02 (0.0%), tests_pri_-1000: 5 (0.1%), tests_pri_-950: 1.44 (0.0%), tests_pri_-900: 1.17 (0.0%), tests_pri_-400: 21 (0.4%), check_bayes: 19 (0.3%), b_tokenize: 6 (0.1%), b_tok_get_all: 5 (0.1%), b_comp_prob: 1.86 (0.0%), b_tok_touch_all: 2.2 (0.0%), b_finish: 0.68 (0.0%), tests_pri_0: 229 (4.1%), check_dkim_signature: 0.66 (0.0%), check_dkim_adsp: 3.2 (0.1%), tests_pri_500: 5269 (94.9%), poll_dns_idle: 5254 (94.7%), rewrite_mail: 0.00 (0.0%) Subject: Re: linux-next: manual merge of the userns tree with Linus' tree X-Spam-Flag: No X-SA-Exim-Version: 4.2.1 (built Thu, 05 May 2016 13:38:54 -0600) X-SA-Exim-Scanned: Yes (on in02.mta.xmission.com) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Stephen Rothwell writes: > Hi Eric, > > Today's linux-next merge of the userns tree got conflicts in: > > arch/alpha/kernel/ptrace.c > arch/blackfin/kernel/ptrace.c > arch/cris/arch-v32/kernel/ptrace.c > arch/ia64/kernel/ptrace.c > arch/mips/kernel/ptrace32.c > arch/powerpc/kernel/ptrace32.c > include/linux/mm.h > kernel/ptrace.c > mm/memory.c > mm/nommu.c > > between commit: > > 442486ec1096 ("mm: replace __access_remote_vm() write parameter with gup_flags") > (and others) > > from Linus' tree and commit: > > 0cabf9a438e1 ("ptrace: Don't allow accessing an undumpable mm") > > from the userns tree. > > I just used the version of the userns tree from next-20161117 for today. > Please merge v4.9-rc2 and fix up the conflicts (or just rebase onto > v4.9-rc2). Will do. Thank you. Eric