The patch titled Subject: linux-next-git-rejects has been removed from the -mm tree. Its filename was linux-next-git-rejects.patch This patch was dropped because it is obsolete ------------------------------------------------------ From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Subject: linux-next-git-rejects Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts | 3 arch/arm64/boot/dts/amlogic/meson-g12a.dtsi | 43 ------------ drivers/gpu/drm/arm/display/komeda/komeda_dev.c | 3 drivers/mmc/host/sdhci-cadence.c | 3 4 files changed, 52 deletions(-) --- a/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi~linux-next-git-rejects +++ a/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi @@ -99,52 +99,9 @@ opp-microvolt = <831000>; }; -<<<<<<< HEAD - usb: usb@ffe09000 { - status = "disabled"; - compatible = "amlogic,meson-g12a-usb-ctrl"; - reg = <0x0 0xffe09000 0x0 0xa0>; - interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>; - #address-cells = <2>; - #size-cells = <2>; - ranges; - - clocks = <&clkc CLKID_USB>; - resets = <&reset RESET_USB>; - - dr_mode = "otg"; - - phys = <&usb2_phy0>, <&usb2_phy1>, - <&usb3_pcie_phy PHY_TYPE_USB3>; - phy-names = "usb2-phy0", "usb2-phy1", "usb3-phy0"; - - dwc2: usb@ff400000 { - compatible = "amlogic,meson-g12a-usb", "snps,dwc2"; - reg = <0x0 0xff400000 0x0 0x40000>; - interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>; - clocks = <&clkc CLKID_USB1_DDR_BRIDGE>; - clock-names = "ddr"; - phys = <&usb2_phy1>; - phy-names = "usb2-phy"; - dr_mode = "peripheral"; - g-rx-fifo-size = <192>; - g-np-tx-fifo-size = <128>; - g-tx-fifo-size = <128 128 16 16 16>; - }; - - dwc3: usb@ff500000 { - compatible = "snps,dwc3"; - reg = <0x0 0xff500000 0x0 0x100000>; - interrupts = <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH>; - dr_mode = "host"; - snps,dis_u2_susphy_quirk; - snps,quirk-frame-length-adjustment; - }; -======= opp-1704000000 { opp-hz = /bits/ 64 <1704000000>; opp-microvolt = <861000>; ->>>>>>> linux-next/akpm-base }; opp-1800000000 { --- a/arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts~linux-next-git-rejects +++ a/arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts @@ -392,8 +392,6 @@ pinctrl-names = "default"; }; -<<<<<<< HEAD -======= &pwm_AO_cd { pinctrl-0 = <&pwm_ao_d_e_pins>; pinctrl-names = "default"; @@ -402,7 +400,6 @@ status = "okay"; }; ->>>>>>> linux-next/akpm-base &pwm_ef { status = "okay"; pinctrl-0 = <&pwm_e_pins>; --- a/drivers/gpu/drm/arm/display/komeda/komeda_dev.c~linux-next-git-rejects +++ a/drivers/gpu/drm/arm/display/komeda/komeda_dev.c @@ -129,10 +129,7 @@ static int komeda_parse_pipe_dt(struct k pipe->of_output_port = of_graph_get_port_by_id(np, KOMEDA_OF_PORT_OUTPUT); -<<<<<<< HEAD -======= pipe->dual_link = pipe->of_output_links[0] && pipe->of_output_links[1]; ->>>>>>> linux-next/akpm-base pipe->of_node = of_node_get(np); return 0; --- a/drivers/mmc/host/sdhci-cadence.c~linux-next-git-rejects +++ a/drivers/mmc/host/sdhci-cadence.c @@ -370,10 +370,7 @@ static int sdhci_cdns_probe(struct platf host->mmc_host_ops.hs400_enhanced_strobe = sdhci_cdns_hs400_enhanced_strobe; sdhci_enable_v4_mode(host); -<<<<<<< HEAD -======= __sdhci_read_caps(host, &version, NULL, NULL); ->>>>>>> linux-next/akpm-base sdhci_get_of_property(pdev); _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are ocfs2-clear-zero-in-unaligned-direct-io-checkpatch-fixes.patch fs-ocfs2-fix-possible-null-pointer-dereferences-in-ocfs2_xa_prepare_entry-fix.patch mm.patch mm-kmemleak-use-the-memory-pool-for-early-allocations-checkpatch-fixes.patch mm-kmemleak-use-the-memory-pool-for-early-allocations-checkpatch-fixes-fix.patch lib-test_kasan-add-roundtrip-tests-checkpatch-fixes.patch mm-introduce-page_shift-fix.patch mm-throttle-allocators-when-failing-reclaim-over-memoryhigh-fix.patch mm-throttle-allocators-when-failing-reclaim-over-memoryhigh-fix-fix.patch mm-throttle-allocators-when-failing-reclaim-over-memoryhigh-fix-fix-fix.patch mm-memory_hotplug-remove-move_pfn_range-fix.patch mm-memory_hotplug-make-sure-the-pfn-is-aligned-to-the-order-when-onlining-fix.patch mm-vmalloc-move-area-pages-after-if-statement-fix.patch mm-z3foldc-remove-useless-code-in-z3fold_page_isolate-fix.patch mm-compaction-clear-total_migratefree_scanned-before-scanning-a-new-zone-fix-fix.patch mm-compaction-clear-total_migratefree_scanned-before-scanning-a-new-zone-fix-2-fix.patch mm-oom-avoid-printk-iteration-under-rcu-fix.patch mm-oom_killer-add-task-uid-to-info-message-on-an-oom-kill-fix.patch psi-annotate-refault-stalls-from-io-submission-fix.patch psi-annotate-refault-stalls-from-io-submission-fix-2.patch mm-mmapc-refine-find_vma_prev-with-rb_last-fix.patch linux-next-rejects.patch diff-sucks.patch mm-introduce-madv_cold-fix.patch mm-introduce-madv_pageout-fix-fix.patch drivers-tty-serial-sh-scic-suppress-warning.patch kernel-forkc-export-kernel_thread-to-modules.patch