From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Jiri Kosina <jikos@kernel•org>,
Benjamin Tissoires <benjamin.tissoires@redhat•com>,
Andrew Morton <akpm@linux-foundation•org>
Cc: Benjamin Tissoires <bentiss@kernel•org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Suren Baghdasaryan <surenb@google•com>
Subject: Re: linux-next: manual merge of the hid tree with the mm tree
Date: Fri, 19 Jul 2024 09:45:32 +1000 [thread overview]
Message-ID: <20240719094532.20fd065d@canb.auug.org.au> (raw)
In-Reply-To: <20240709112544.190ffda4@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1948 bytes --]
Hi all,
On Tue, 9 Jul 2024 11:25:44 +1000 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the hid tree got a conflict in:
>
> include/linux/hid_bpf.h
>
> between commit:
>
> bad8443fbbca ("mm: add comments for allocation helpers explaining why they are macros")
>
> from the mm-unstable branch of the mm tree and commit:
>
> 6cd735f0e57a ("HID: bpf: protect HID-BPF prog_list access by a SRCU")
>
> from the hid 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.
>
> diff --cc include/linux/hid_bpf.h
> index 99a3edb6cf07,9ca96fc90449..000000000000
> --- a/include/linux/hid_bpf.h
> +++ b/include/linux/hid_bpf.h
> @@@ -151,12 -227,7 +227,12 @@@ static inline int dispatch_hid_bpf_outp
> static inline int hid_bpf_connect_device(struct hid_device *hdev) { return 0; }
> static inline void hid_bpf_disconnect_device(struct hid_device *hdev) {}
> static inline void hid_bpf_destroy_device(struct hid_device *hid) {}
> - static inline void hid_bpf_device_init(struct hid_device *hid) {}
> + static inline int hid_bpf_device_init(struct hid_device *hid) { return 0; }
> +/*
> + * This specialized allocator has to be a macro for its allocations to be
> + * accounted separately (to have a separate alloc_tag). The typecast is
> + * intentional to enforce typesafety.
> + */
> #define call_hid_bpf_rdesc_fixup(_hdev, _rdesc, _size) \
> ((u8 *)kmemdup(_rdesc, *(_size), GFP_KERNEL))
>
This is now a conflict between the mm-stable branch of the mm tree
and Linus' tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
prev parent reply other threads:[~2024-07-18 23:45 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-09 1:25 linux-next: manual merge of the hid tree with the mm tree Stephen Rothwell
2024-07-18 23:45 ` Stephen Rothwell [this message]
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=20240719094532.20fd065d@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=benjamin.tissoires@redhat$(echo .)com \
--cc=bentiss@kernel$(echo .)org \
--cc=jikos@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=surenb@google$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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