From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) (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 F0820328DB for ; Wed, 24 Apr 2024 20:34:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.46 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713990857; cv=none; b=UwQoadpxC5d7hRFqN0GJ9PWzxsWKPQcfvZWEHBSafcVqsaoKZK4BOe9YFc2zN5HSKqTJs2pQATSlcKdPcrzmp6JkC+/x79Vrf6eTW9SNOA0JPSY/ucFbB3nnHE+DLIVzD/oKDVcx+7qK2YQi8iytrbuuu73dpUJeQ69oxqxOXWY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713990857; c=relaxed/simple; bh=N4tR1OCvxXlmqdsmBOe02z1y7xWXGhLUQ3ZnQ2QDSls=; h=MIME-Version:References:In-Reply-To:From:Date:Message-ID:Subject: To:Cc:Content-Type; b=n+qA+uyoDCAa/xji9fOMv09AAIcwsKcXrRgO2iG0M9jaMEtE5oQ0YguGkwJHzsd3Jydp2GtOyXmRaAP8y2bpxp+bGf78z+QXXEg7AGyN3JPHrOBf1IHSyYmSqNndkVvP4ZGtUlR42yu/6XS370EC1j6whIzS5ij4BsgtXhuI2eI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=Ttse6SKn; arc=none smtp.client-ip=209.85.128.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="Ttse6SKn" Received: by mail-wm1-f46.google.com with SMTP id 5b1f17b1804b1-4155819f710so1958135e9.2 for ; Wed, 24 Apr 2024 13:34:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1713990854; x=1714595654; 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=o3lACvsZ6zPvEprpO/EkNnTnrMAczxl+qNGhSvuhv70=; b=Ttse6SKnVtu+sxNMgF0lVhMX8EFKhmhtY952CUKIeahe5ZK+fSyyln/yGuxig8MeZK I/bXG7xEME2GqtZMen60ZzfSc2sY7QyMxrazC5HrLcgnCunwrj4Ur2kteMaS+SCuz8DA 0ifL5eqFiD2XHYGJEq0SDl2FSWRkMSGmlrJJgeGpxjd2xOEaSHrBZfDhq7aqrNIoJcr/ r1dFN+fPJgnOwHEr9YRvhaH6Dz+udEi6KXa7TZCzN7aVTHbekq+A/N1BXHyLkq70IWQd BmPV45uDfXBAOCjNihIOVq6c5jt1A6kTVn/EiIMojlVQeG5TIF2bVCiKTOGs/pwGzD3b t88w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713990854; x=1714595654; 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=o3lACvsZ6zPvEprpO/EkNnTnrMAczxl+qNGhSvuhv70=; b=w6ccXnekzMvvgzUX1FEYiKrUZ8b+KUMglmwf4B9oIJC4w35Hl0L9XOHFS5joC4F59V eOs7jMez2BOIHDSZyQ8QUl9eSJ4BSdU4VGUakUii+PXMDgwLhNQSrt0CVvPkRpD83FTJ aBOiFXrh/ACHDaYCSJ6gUNPIX9/+UC3w7zx7zCGKqtIAuIcAuflE5MjCnZtFEVSHgwip swLUOBi+W/shQzViJlf6GhDM4lY0xZ2OmIgH1ho4Ef0ycOqCG+uFlXE0GaL6Kuk7WCcD ElmgLWYbRfkWfyLuhwUKu3NkomVRwzx6QBQ6tEeU30XftBUNi7SWTvAMY02rRX7LA3pn HxSw== X-Forwarded-Encrypted: i=1; AJvYcCUkjuaqSiU4k+AtBTUu3r9vEc/zMvO9+WykQaTvh4j4CuPr8iNkBp/GMN9pl4Q/qv0KSyaPh1aVrK/QOoV69C+b+7Pn+8ewjKPwzQ== X-Gm-Message-State: AOJu0YwQbeCAPALAetQv6lE/8tvkFP5EG8R3EHp2Ulpt0fX25jg+H+J3 8JsloULwQsGRM2Bm9pNSBfT1OnYL2EkGNEtG+jwWqSqfEpFSdUJcJcIEbEyjC1n6wpfUJFIRAUC B8yNlHIdoChnIkgH22gEYiIMLRAuyS556WZDR X-Google-Smtp-Source: AGHT+IEpGQsy2wCErtKmtKEcA5NEcY+P1tgXlC5lhSeZkEfEoz+zEFlVXQM5BLNFUYcyPkWe/W0nWNsRNvjlNv9w/5k= X-Received: by 2002:a5d:4dcd:0:b0:34b:4afc:5d52 with SMTP id f13-20020a5d4dcd000000b0034b4afc5d52mr2870877wru.9.1713990854243; Wed, 24 Apr 2024 13:34:14 -0700 (PDT) Precedence: bulk X-Mailing-List: linux-next@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 References: <20240424123935.2f65e886@canb.auug.org.au> <20240424130757.531be2842c505a62246d180c@linux-foundation.org> In-Reply-To: From: Suren Baghdasaryan Date: Wed, 24 Apr 2024 13:33:58 -0700 Message-ID: Subject: Re: linux-next: manual merge of the modules tree with the mm tree To: Mike Rapoport Cc: Andrew Morton , Stephen Rothwell , Luis Chamberlain , Linux Kernel Mailing List , Linux Next Mailing List , Kent Overstreet Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Wed, Apr 24, 2024 at 1:31=E2=80=AFPM Mike Rapoport wro= te: > > On Wed, Apr 24, 2024 at 01:07:57PM -0700, Andrew Morton wrote: > > On Wed, 24 Apr 2024 12:39:35 +1000 Stephen Rothwell wrote: > > > > > Hi all, > > > > > > Today's linux-next merge of the modules tree got a conflict in: > > > > > > kernel/module/main.c > > > > > > between commits: > > > > > > 7f014cdda4cb ("lib: code tagging module support") > > > 5ab9b0c7ea5c ("lib: prevent module unloading if memory is not freed= ") > > > > > > from the mm-unstable branch of the mm tree and commits: > > > > > > 0746f9982603 ("module: make module_memory_{alloc,free} more self-co= ntained") > > > 18da532eefc8 ("mm/execmem, arch: convert remaining overrides of mod= ule_alloc to execmem") > > > > > > from the modules tree. > > > > > > I fixed it up (I think, see below) and can carry the fix as > > > necessary. This is now fixed as far as linux-next is concerned, but a= ny > > > non trivial conflicts should be mentioned to your upstream maintainer > > > when your tree is submitted for merging. You may also want to consid= er > > > cooperating with the maintainer of the conflicting tree to minimise a= ny > > > particularly complex conflicts. > > > > That's a shame. I don't see much that we can do to reduce the damage h= ere. > > I can rebase it on mm-unstable and this can go via the mm tree. Conflict resolution looks fine to me. I'll run relevant tests on linux-next within 2 hours. > > > Suren&Kent, please review (and preferably) test Stephen's handiwork in > > linux-next? > > > > -- > Sincerely yours, > Mike.