rust-for-linux.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Tamir Duberstein <tamird@gmail.com>
To: Miguel Ojeda <miguel.ojeda.sandonis@gmail.com>
Cc: "Alice Ryhl" <aliceryhl@google.com>,
	"Boqun Feng" <boqun.feng@gmail.com>,
	"Danilo Krummrich" <dakr@kernel.org>,
	"Miguel Ojeda" <ojeda@kernel.org>,
	"Alex Gaynor" <alex.gaynor@gmail.com>,
	"Gary Guo" <gary@garyguo.net>,
	"Björn Roy Baron" <bjorn3_gh@protonmail.com>,
	"Benno Lossin" <benno.lossin@proton.me>,
	"Andreas Hindborg" <a.hindborg@kernel.org>,
	"Trevor Gross" <tmgross@umich.edu>,
	"Maíra Canal" <mcanal@igalia.com>,
	"Asahi Lina" <lina@asahilina.net>,
	rust-for-linux@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH v9 2/2] rust: xarray: Add an abstraction for XArray
Date: Tue, 19 Nov 2024 13:22:19 -0500	[thread overview]
Message-ID: <CAJ-ks9kgaVGow2o1S+YAUpYF6pVFReEb2mf+OFMvULt2pykH7g@mail.gmail.com> (raw)
In-Reply-To: <CANiq72=MeVViwfFGaj7MFev0ZOodVo2dJqOeHiPodHjN-xh9TA@mail.gmail.com>

Looks like there are merge conflicts between v6.13 and rust-next.
What's the usual process for resolution?

  reply	other threads:[~2024-11-19 18:22 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-11-18 16:33 [PATCH v9 0/2] rust: xarray: Add a minimal abstraction for XArray Tamir Duberstein
2024-11-18 16:33 ` [PATCH v9 1/2] rust: types: add `ForeignOwnable::PointedTo` Tamir Duberstein
2024-11-18 16:33 ` [PATCH v9 2/2] rust: xarray: Add an abstraction for XArray Tamir Duberstein
2024-11-18 22:18   ` Boqun Feng
2024-11-19 16:23     ` Tamir Duberstein
2024-11-19 16:28       ` Alice Ryhl
2024-11-19 16:39         ` Tamir Duberstein
2024-11-19 16:43           ` Alice Ryhl
2024-11-19 16:51             ` Tamir Duberstein
2024-11-19 16:52               ` Miguel Ojeda
2024-11-19 18:22                 ` Tamir Duberstein [this message]
2024-11-19 18:40                   ` Miguel Ojeda
2024-11-19 18:55                     ` Tamir Duberstein
2024-11-18 16:51 ` [PATCH v9 0/2] rust: xarray: Add a minimal " Miguel Ojeda
2024-11-18 17:02   ` Tamir Duberstein
2024-11-18 17:05     ` Miguel Ojeda
2024-11-19 11:11     ` Maíra Canal
2024-11-19 12:26       ` Asahi Lina
2024-11-19 14:21         ` Tamir Duberstein
2024-11-19 14:24           ` Tamir Duberstein

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=CAJ-ks9kgaVGow2o1S+YAUpYF6pVFReEb2mf+OFMvULt2pykH7g@mail.gmail.com \
    --to=tamird@gmail.com \
    --cc=a.hindborg@kernel.org \
    --cc=alex.gaynor@gmail.com \
    --cc=aliceryhl@google.com \
    --cc=benno.lossin@proton.me \
    --cc=bjorn3_gh@protonmail.com \
    --cc=boqun.feng@gmail.com \
    --cc=dakr@kernel.org \
    --cc=gary@garyguo.net \
    --cc=lina@asahilina.net \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mcanal@igalia.com \
    --cc=miguel.ojeda.sandonis@gmail.com \
    --cc=ojeda@kernel.org \
    --cc=rust-for-linux@vger.kernel.org \
    --cc=tmgross@umich.edu \
    /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
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).