From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-il1-f179.google.com (mail-il1-f179.google.com [209.85.166.179]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C06201A3159 for ; Tue, 18 Mar 2025 15:42:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.166.179 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742312549; cv=none; b=F4LEmriLyztxhnCShDZcgwxMSWCHQO74RDoxPOkafJrLa69O8dgebSQaZV3rr9thTR6M56JjcyjddGlmztU6m+zvBLrCpn9u4duALUtP6pzchPbsrcA4APtTqSVARVPHlXER8i3LwYjHIatT04GantcXiA0VJMfBacB8u4V3Q0Q= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742312549; c=relaxed/simple; bh=Hwdtp4nHusm0bzMZH2sjJxFzaX4iEMDSAD2WQE8AUow=; h=MIME-Version:References:In-Reply-To:From:Date:Message-ID:Subject: To:Cc:Content-Type; b=ne7ucglr1JJRtNpvnZeIG/hALW/q9HdrFDYEwqxfmxbuhOWx2zYjvDbqtcRmpKqSoHSn4W80zN58Xsh8b6eOiuoK9Bg/ZwWnoS4wshQ8YAVEG01GqjLb4r2OHPz9H9s+ERE+mSh7OzXb4i4KQmW/dbz3ZLdcRpY0sRXuzIzMJA4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=omnibond.com; spf=pass smtp.mailfrom=omnibond.com; dkim=pass (2048-bit key) header.d=omnibond-com.20230601.gappssmtp.com header.i=@omnibond-com.20230601.gappssmtp.com header.b=tUJxnqu8; arc=none smtp.client-ip=209.85.166.179 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=omnibond.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=omnibond.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=omnibond-com.20230601.gappssmtp.com header.i=@omnibond-com.20230601.gappssmtp.com header.b="tUJxnqu8" Received: by mail-il1-f179.google.com with SMTP id e9e14a558f8ab-3d46fbfab10so15832575ab.0 for ; Tue, 18 Mar 2025 08:42:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=omnibond-com.20230601.gappssmtp.com; s=20230601; t=1742312547; x=1742917347; darn=vger.kernel.org; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=bhhBaUByL11Eg/L/aJ0UGIONk2f7UqBYF49j1/2iJBc=; b=tUJxnqu8S0+oEDg6jzoJrNoRRn9bstd1RHp0l+lDmdoYKRBxqWFOm9RoLIGMtlmEkG 7W1tYwXt7IbjuFgUw0I4KpBWZQOt3QfZqxF/SlpB3qMp7iAP3ENrgBNYRZ+INnIasbiB AMhw/ulidChlErQzuqcghPHF45oahhb7LYz7aooAMlZ9HJjl9rtL2BVLUAzxULtpt8OH Ypx0aHoMFVnzillnrIc1gbRLwobSGlFGCHxrzL63MhFelgapc+eL9k6sKgY7dzuutela YlyCuljIzmatLNCnTkHTGfiQ8E5RWg9kcoKDNuOB7riTa14NPdoZE7rUuGIL1OIHFqY/ tSCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742312547; x=1742917347; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=bhhBaUByL11Eg/L/aJ0UGIONk2f7UqBYF49j1/2iJBc=; b=rDcLAhZwaEiTP/kfxshVfAceuiHwWuxnsR/NytAZa5ej1NMOdCqyMQBZhrkH7R+qpl Z+wXsREeI9WVuJcoqXGT3Y0pCwDfDeBBiDKwCrtbYl1AP/O1TqLz6AdML2cyGBmjyvJS D/Z9LuhKnVJD+tadTvhWKFE/rc69Sg1ahOVOZcQcFvOIKNqOAlu0y6/teJOkc5CUBkVc nUN8X4l/RAhwzf0+iJnv6UD7iw8tIbmAX2W9YzImmef/VzJRs9DWyBw9wOiR4v+T15uu UUz8isXPokX4OclU9x88if4MMrTDBSk6k6jXJ96I90C0nEsNQcR937VmBuye35LWjHke VpEw== X-Forwarded-Encrypted: i=1; AJvYcCWD72V8pBE9i9G4vyKZrpW3pe7G4ebbmxKb3QA7e5NGz8U7DY98uJIvfaVDiT9wsDty66GSATq0xAgbJak=@vger.kernel.org X-Gm-Message-State: AOJu0Yy5G+CvWveIQWy7QJat4cTRtlM0YUgkBqvzZD4eeK6R9dUYIfWk Gy5cTAfXTyv7aGKXImcKYY/9m/UKT0A6oyPGMOpItMn9AI8AHp8DYzXAbB8w/07AgvJT5lqgiNb iMLOqk6xl6P3hyU7S0ZlDMHkE9j6fXXDbEjqZ X-Gm-Gg: ASbGncu8nZXJ80oL6hf1U0cofIQn/YqFdzde3tcKOIBF4yRfjnlbbBhSCw3VQWSFzCY GtdW1durqHf1oRfjReB2izGLjf0bxLLMgUik3yat9oEyt1QihFFdRAdhc510TrsUb3tSIUBtyeA HO5aBWAVTEKiM5SjjCWxrzprvGpBq6D8zCtD0+9wLvBKIGNxOX X-Google-Smtp-Source: AGHT+IFxnYvCAuvPU42m6/QC1ywQA85OXr0FTCGOwuudEBHkzLK3cxIzbtf8pL2zy7+O30GTiOC2JUsE+fj6fWoxR44= X-Received: by 2002:a05:6e02:198b:b0:3d3:e2a1:1f23 with SMTP id e9e14a558f8ab-3d483a75f20mr199628305ab.20.1742312546859; Tue, 18 Mar 2025 08:42:26 -0700 (PDT) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 References: <20250318101256.01afbb47@canb.auug.org.au> <09c18763-7a60-4eea-b77b-85260b8b6b02@app.fastmail.com> In-Reply-To: <09c18763-7a60-4eea-b77b-85260b8b6b02@app.fastmail.com> From: Mike Marshall Date: Tue, 18 Mar 2025 11:42:15 -0400 X-Gm-Features: AQ5f1JrPIfXgu_k4Po3vsh9qy_T5bnnvC4odhum41Kh6EH0sFSxEyeqjpkgtViw Message-ID: Subject: Re: linux-next: build failure after merge of the vfs-brauner tree To: Arnd Bergmann Cc: Stephen Rothwell , Christian Brauner , Matthew Wilcox , Linux Kernel Mailing List , linux-next , Mike Marshall Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Arnd... thanks, I'll get 'er done... -Mike On Tue, Mar 18, 2025 at 11:38=E2=80=AFAM Arnd Bergmann wrot= e: > > On Tue, Mar 18, 2025, at 16:24, Mike Marshall wrote: > > Hi Stephen... is there something I should do differently? I might be > > using an older > > version of the patch, it was sent to me around three weeks ago. > > > >>>Caused by commit > > >> 50fb0a7f43c0 ("orangefs: Move s_kmod_keyword_mask_map to > > orangefs-debugfs.c") > >>>merging badly with commit > > >> 063f8013373a ("orangefs: move s_kmod_keyword_mask_map[] into debugf= s.c") > > > > One has "Move" the one I'm using has "move", as if the author (Arnd) > > made an update > > to the patch and maybe I missed it...? > > The earlier patch was from Matthew Wilcox. Our two patches are > almost identical (they add the same data in different parts of the > file) but sent independently, and the problem was that both got > applied instead of just one. I think the easiest fix would be > if you just drop my patch from your tree. > > Arnd