Changes in o2cb

cdd5b5a9761fd66d17586e4f4ba6588c70e640ea - Merge branch 'next' into for-linus

Tue, 07 Nov 2023 00:42:08 +0100

Merge branch 'next' into for-linusPrepare input updates for 6.7 merge window. List of files: /linux/Documentation/ABI/removed/o2cb

34069d12e239ae8f36dd96c378e4622fb1c42a76 - Merge tag 'v6.5' into next

Tue, 05 Sep 2023 23:08:14 +0200

Merge tag 'v6.5' into nextSync up with mainline to bring in updates to the shared infrastructure. List of files: /linux/Documentation/ABI/removed/o2cb

2612e3bbc0386368a850140a6c9b990cd496a5ec - Merge drm/drm-next into drm-intel-next

Mon, 07 Aug 2023 23:14:42 +0200

Merge drm/drm-next into drm-intel-nextCatching-up with drm-next and drm-intel-gt-next.It will unblock a code refactor around the platformdefinitions (names vs acronyms).Signed-off-by: Rodrigo Vivi List of files: /linux/Documentation/ABI/removed/o2cb

9f771739a04919226081a107167596de75108fbb - Merge drm/drm-next into drm-intel-gt-next

Mon, 07 Aug 2023 12:29:40 +0200

Merge drm/drm-next into drm-intel-gt-nextNeed to pull in b3e4aae612ec ("drm/i915/hdcp: Modify hdcp_gsc_message msg sending mechanism") asa dependency for https://patchwork.freedesktop.org/series/121735/Signed-off-by: Joonas Lahtinen List of files: /linux/Documentation/ABI/removed/o2cb

61b7369483efb5e0a9f3b48e75fac00d46d661e0 - Merge drm/drm-next into drm-misc-next

Mon, 24 Jul 2023 15:44:47 +0200

Merge drm/drm-next into drm-misc-nextBackmerging to get v6.5-rc2.Signed-off-by: Thomas Zimmermann List of files: /linux/Documentation/ABI/removed/o2cb

0791faebfe750292a8a842b64795a390ca4a3b51 - ASoC: Merge v6.5-rc2

Mon, 17 Jul 2023 07:12:31 +0200

ASoC: Merge v6.5-rc2Get a similar baseline to my other branches, and fixes for people usingthe branch. List of files: /linux/Documentation/ABI/removed/o2cb

eb1b24a9bb6982bb44b135e3490d3159ba0be4f2 - Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Fri, 14 Jul 2023 02:33:19 +0200

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/netCross-merge networking fixes after downstream PR.No conflicts or adjacent changes.Signed-off-by: Jakub Kicinski List of files: /linux/Documentation/ABI/removed/o2cb

2f98e686ef59b5d19af5847d755798e2031bee3a - Merge v6.5-rc1 into drm-misc-fixes

Tue, 11 Jul 2023 09:23:20 +0200

Merge v6.5-rc1 into drm-misc-fixesBoris needs 6.5-rc1 in drm-misc-fixes to prevent a conflict.Signed-off-by: Maxime Ripard List of files: /linux/Documentation/ABI/removed/o2cb

946c6b59c56dc6e7d8364a8959cb36bf6d10bc37 - Merge tag 'mm-hotfixes-stable-2023-07-08-10-43' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

Sat, 08 Jul 2023 23:30:25 +0200

Merge tag 'mm-hotfixes-stable-2023-07-08-10-43' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mmPull hotfixes from Andrew Morton: "16 hotfixes. Six are cc:stable and the remainder address post-6.4 issues"The merge undoes the disabling of the CONFIG_PER_VMA_LOCK feature, sinceit was all hopefully fixed in mainline.* tag 'mm-hotfixes-stable-2023-07-08-10-43' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm: lib: dhry: fix sleeping allocations inside non-preemptable section kasan, slub: fix HW_TAGS zeroing with slub_debug kasan: fix type cast in memory_is_poisoned_n mailmap: add entries for Heiko Stuebner mailmap: update manpage link bootmem: remove the vmemmap pages from kmemleak in free_bootmem_page MAINTAINERS: add linux-next info mailmap: add Markus Schneider-Pargmann writeback: account the number of pages written back mm: call arch_swap_restore() from do_swap_page() squashfs: fix cache race with migration mm/hugetlb.c: fix a bug within a BUG(): inconsistent pte comparison docs: update ocfs2-devel mailing list address MAINTAINERS: update ocfs2-devel mailing list address mm: disable CONFIG_PER_VMA_LOCK until its fixed fork: lock VMAs of the parent process when forking List of files: /linux/Documentation/ABI/removed/o2cb

5a569db68c6a961cf75993b16bdcc2fed087df9d - docs: update ocfs2-devel mailing list address

Wed, 28 Jun 2023 03:34:37 +0200

docs: update ocfs2-devel mailing list addressThe ocfs2-devel mailing list has been migrated to the kernel.orginfrastructure, update all related documentation pointers to reflect thechange.Link: https://lkml.kernel.org/r/20230628013437.47030-3-ailiop@suse.comSigned-off-by: Anthony Iliopoulos Acked-by: Joseph Qi Acked-by: Joel Becker Cc: Changwei Ge Cc: Gang He Cc: Jun Piao Cc: Junxiao Bi Cc: Mark Fasheh Signed-off-by: Andrew Morton List of files: /linux/Documentation/ABI/removed/o2cb

e5451c8f8330e03ad3cfa16048b4daf961af434f - Merge remote-tracking branch 'linusw-gpio/for-next' into devm_gpiochip

Tue, 23 Feb 2016 15:07:08 +0100

Merge remote-tracking branch 'linusw-gpio/for-next' into devm_gpiochipBase for demv_gpiochip_add_data() and devm_gpiochip_remove(). List of files: /linux/Documentation/ABI/removed/o2cb

da733563be5a9da26fe81d9f007262d00b846e22 - Merge branch 'next' into for-linus

Mon, 09 Jan 2012 08:38:23 +0100

Merge branch 'next' into for-linus List of files: /linux/Documentation/ABI/removed/o2cb

251f39fe42dae863bd24e30864e6b66076ba076d - Merge branch 'power-supply-scope' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen

Wed, 04 Jan 2012 06:09:35 +0100

Merge branch 'power-supply-scope' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen List of files: /linux/Documentation/ABI/removed/o2cb

e4da3fbfbd1de56d2367653e3823e6445e49f8a9 - Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into wl12xx-next

Thu, 01 Dec 2011 11:14:48 +0100

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into wl12xx-next List of files: /linux/Documentation/ABI/removed/o2cb

0d2cd91bf7b1a7cc1d638296111fcc2bcf5c0bb4 - Merge commit 'v3.2-rc3' into next

Tue, 29 Nov 2011 10:51:07 +0100

Merge commit 'v3.2-rc3' into next List of files: /linux/Documentation/ABI/removed/o2cb

d4bbf7e7759afc172e2bfbc5c416324590049cdd - Merge branch 'master' into x86/memblock

Mon, 28 Nov 2011 18:46:22 +0100

Merge branch 'master' into x86/memblockConflicts & resolutions:* arch/x86/xen/setup.c dc91c728fd "xen: allow extra memory to be in multiple regions" 24aa07882b "memblock, x86: Replace memblock_x86_reserve/free..." conflicted on xen_add_extra_mem() updates. The resolution is trivial as the latter just want to replace memblock_x86_reserve_range() with memblock_reserve().* drivers/pci/intel-iommu.c 166e9278a3f "x86/ia64: intel-iommu: move to drivers/iommu/" 5dfe8660a3d "bootmem: Replace work_with_active_regions() with..." conflicted as the former moved the file under drivers/iommu/. Resolved by applying the chnages from the latter on the moved file.* mm/Kconfig 6661672053a "memblock: add NO_BOOTMEM config symbol" c378ddd53f9 "memblock, x86: Make ARCH_DISCARD_MEMBLOCK a config option" conflicted trivially. Both added config options. Just letting both add their own options resolves the conflict.* mm/memblock.c d1f0ece6cdc "mm/memblock.c: small function definition fixes" ed7b56a799c "memblock: Remove memblock_memory_can_coalesce()" confliected. The former updates function removed by the latter. Resolution is trivial.Signed-off-by: Tejun Heo List of files: /linux/Documentation/ABI/removed/o2cb

300e812db26f4aa022e346f5fb9af1af134d98d8 - Merge commit 'v3.2-rc2' into fbdev-next

Tue, 22 Nov 2011 00:42:06 +0100

Merge commit 'v3.2-rc2' into fbdev-next List of files: /linux/Documentation/ABI/removed/o2cb

24942c8e5cc8696064ee207ff29d4cf21f70dafc - Merge branch 'master'; commit 'v3.2-rc2' into next

Wed, 16 Nov 2011 02:39:48 +0100

Merge branch 'master'; commit 'v3.2-rc2' into next List of files: /linux/Documentation/ABI/removed/o2cb

5e819059a20b0fc5a71875f28b4cae359e38d85a - Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless

Wed, 09 Nov 2011 20:49:23 +0100

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless List of files: /linux/Documentation/ABI/removed/o2cb

41966710ab574f1fcedf3e10e1ceef911c096d1d - Merge branch 'for-3.2' into for-3.3

Tue, 08 Nov 2011 11:47:46 +0100

Merge branch 'for-3.2' into for-3.3 List of files: /linux/Documentation/ABI/removed/o2cb