Messages in this thread | | | Date | Mon, 20 Mar 2023 22:40:56 -0700 | From | Luis Chamberlain <> | Subject | Re: linux-next: manual merge of the sysctl tree with Linus' tree |
| |
On Tue, Mar 21, 2023 at 01:22:27PM +1100, Stephen Rothwell wrote: > Hi all, > > On Tue, 21 Mar 2023 13:20:52 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote: > > > > Today's linux-next merge of the sysctl tree got a conflict in: > > > > mm/memory-failure.c > > > > between commit: > > > > 44b8f8bf2438 ("mm: memory-failure: add memory failure stats to sysfs") > > > > from Linus' tree and commit: > > > > cfe7e6ea5ee2 ("mm: memory-failure: Move memory failure sysctls to its own file") > > > > from the sysctl 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. > > Sorry, I forgot the resolution - see below.
Oh sorry, its on Linus' tree, so I can just rebase too. Did that and addressed the conflict as you did, thanks!
Luis
| |