From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-il1-f181.google.com (mail-il1-f181.google.com [209.85.166.181]) (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 1E6F11D2B3C for ; Mon, 21 Oct 2024 16:52:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.166.181 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729529580; cv=none; b=E23+M2i+7nBiCNDvfUtK/d2sbE1290YrlpyUFwR58CJ8JrIlbfdPClfgLT9WlO/h126Xb+iTkeXZj66TOmjXcbjPp41zemuJSW4fSYAqqAua7Vm0O0yy44wYd8ZdNNPm1fGH1uy6z7+LMoFSRyZt3cSKOBeLXU+YF6sZK5t8xg4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729529580; c=relaxed/simple; bh=BpnLZMowJalrbQKUv23P7u9lcA6cVv0aDf/cLXF9Cgs=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=CHnGCIExiMSz5xtFuHqoeWJOodxvVrozNdktKSEffCAoypVA8Fq82/76d7tjMwHBDk7qNf0fAG1v5ID5+Y+WrEWi1LuGoioW5RzzseRfD1EY+XJCdU+aWhdfl/RzqaKAWxQgnHaBJGmglfjc4/H3VHr0lmfkRRIIVnfWsSS/kpc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.dk; spf=pass smtp.mailfrom=kernel.dk; dkim=pass (2048-bit key) header.d=kernel-dk.20230601.gappssmtp.com header.i=@kernel-dk.20230601.gappssmtp.com header.b=TZAnD6hu; arc=none smtp.client-ip=209.85.166.181 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.dk Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=kernel.dk Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel-dk.20230601.gappssmtp.com header.i=@kernel-dk.20230601.gappssmtp.com header.b="TZAnD6hu" Received: by mail-il1-f181.google.com with SMTP id e9e14a558f8ab-3a4c303206eso4308825ab.3 for ; Mon, 21 Oct 2024 09:52:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20230601.gappssmtp.com; s=20230601; t=1729529576; x=1730134376; darn=vger.kernel.org; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=Gfh0Sg6Ju5mOvFo4y0H7LztT2uP3kP9lZo3T9Q32ISI=; b=TZAnD6hum6zANwepzCGs8qvOY/7IylFC81kS7Bn4nzqAW6sqI38j6YkQ1BKExNYfjH aY1SiB7srX+JJoJuR6t1EGxI4+lQubnw+cZfSakh5f6ejzD0mWL3OhI9aqgwEAtmTdZj z0B5QMJxbJ8Rz/C+QOm1jI2cOBApXILlsJ30uEIfEBn1rJARR6to/VSDMe+7IsjpUQyj PSducra5Hv7zZxEnDJd3bQbgB1HOXCFn71/LEd8ZJx9jyKMV1ZZZJvAugcVEpDtBIA+0 uHhFHrdKbKHYPLNKj4va40IgmmfFxIAWbyiPZAT5C5SJRW78kPme2xI7E6CtNeSZHoWf pD7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729529576; x=1730134376; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Gfh0Sg6Ju5mOvFo4y0H7LztT2uP3kP9lZo3T9Q32ISI=; b=K+z96RzCZBi8wRNR1uAwxs5kT/ZkaYBp2BqTavzDLygaBeRRZIz2yZfD3oDvSEmqMx 2V1/Vif4M4SMjZJWOno3cibDAb2rlmWu25RJR6F9qH2ODhRQsMqiSC8DHsgGQg5h3zGT YtI2kLW6VaEsWKS8Rh58TaLQ4MWy6p0XUSdEwSskmNeaNMrO1vXOas1qIigmx05zGYHQ B8rf6XaGIgvjWcmxV6vi9XXck1wB8y4ELrDXNL0Eo3JEx+WY52Vowyreka/mKBDNe8WN g97is4lVeDIrBMAY/tDLWBq7fQxkuXXydXZEQ3pOXVBm584tcVJtIBiNxxQo9+2O7svg VAFg== X-Forwarded-Encrypted: i=1; AJvYcCWhln26nxfEb5dTU8i0Nd0HKQyfnATha2a1hfialkHzBapSMo6kc/wQOaQyeSmkpFpKl5yIW2YXQ+UmR1E=@vger.kernel.org X-Gm-Message-State: AOJu0Yz94dmMZ2zNaQTdWoqdAjZrlBdD3/w91KzNmiTL3rpUv7K45N2a ljb+TYYqZp0P4k7D76t62h2BcgtqhHRoCEoyRg4gWcAQYoGdkzt4NmOJQpzkYCo= X-Google-Smtp-Source: AGHT+IHgIdN+JiAiTnsRm5UTY+2lg8bIR9zHN/yKc4d9aueVUi/2xx+2pYTCq9c/VJYIUPz83ozKlw== X-Received: by 2002:a05:6e02:b2a:b0:3a0:8d60:8b7d with SMTP id e9e14a558f8ab-3a3f4060bfbmr122347365ab.11.1729529576137; Mon, 21 Oct 2024 09:52:56 -0700 (PDT) Received: from [192.168.1.116] ([96.43.243.2]) by smtp.gmail.com with ESMTPSA id e9e14a558f8ab-3a400b634d4sm12614975ab.58.2024.10.21.09.52.55 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 21 Oct 2024 09:52:55 -0700 (PDT) Message-ID: Date: Mon, 21 Oct 2024 10:52:54 -0600 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: linux-next: manual merge of the block tree with Linus' tree To: Stephen Rothwell Cc: Breno Leitao , Christoph Hellwig , Linux Kernel Mailing List , Linux Next Mailing List References: <20241021120631.5ed43983@canb.auug.org.au> Content-Language: en-US From: Jens Axboe In-Reply-To: <20241021120631.5ed43983@canb.auug.org.au> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit On 10/20/24 7:06 PM, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the block tree got a conflict in: > > block/elevator.c > > between commit: > > b4ff6e93bfd0 ("elevator: do not request_module if elevator exists") > > from Linus' tree and commit: > > a2c17a5ea44f ("block: return void from the queue_sysfs_entry load_module method") > > from the block tree. > > I fixed it up (see below) and can carry the fix as necessary. This > is now fixed as far as linux-next is concerned, but any non trivial > conflicts should be mentioned to your upstream maintainer when your tree > is submitted for merging. You may also want to consider cooperating > with the maintainer of the conflicting tree to minimise any particularly > complex conflicts. I'll cooperate better with myself :-) Merge looks good - just did it on my end too for my for-next branch, and it's identical. Your next pull of the block for-next branch should merge cleanly. -- Jens Axboe