Messages in this thread | | | Subject | Re: [PATCH 0/2] [GIT PULL] localmodconfig: Fix missing depends of config files included in if statements | From | Steven Rostedt <> | Date | Mon, 29 Apr 2013 20:17:18 -0400 |
| |
On Mon, 2013-04-29 at 20:08 -0400, Steven Rostedt wrote: > On Mon, 2013-04-29 at 14:42 -0700, Linus Torvalds wrote: > > On Mon, Apr 29, 2013 at 2:01 PM, Linus Torvalds > > <torvalds@linux-foundation.org> wrote: > > > > > > There's just too much confusion here for me to touch anything at all, > > > so please fix things up. > > > > Oh, and you might as well check that I resolved the conflicts in the > > trace pull correctly while you're at it. They looked pretty obvious, > > and it compiles for me, but .. > > Almost. >
BTW, what's the preferred method for this. I already posted a lot of work to linux-next when I found bugs that required going into your tree. I backported the fixes knowing that it will cause conflicts when you merge.
IIRC, you stated that you don't mind doing conflict resolutions yourself, so I did not try to fix it a head of time, as the conflicts were rather minor.
Should I have merged your tree and done the conflict resolutions myself, or was it OK to do what I did, and let you do the conflict resolution and send you any fixes that needed to be done afterward?
-- Steve
| |