From: Andy Shevchenko <andriy.shevchenko@linux•intel.com>
To: Ralph Siemsen <ralph.siemsen@linaro•org>
Cc: Stephen Rothwell <sfr@canb•auug.org.au>, Greg KH <greg@kroah•com>,
Arnd Bergmann <arnd@arndb•de>,
Greg Kroah-Hartman <gregkh@linuxfoundation•org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: Re: linux-next: manual merge of the char-misc tree with the char-misc.current tree
Date: Mon, 6 Dec 2021 18:44:04 +0200 [thread overview]
Message-ID: <Ya491Dtj7HqoMhvW@smile.fi.intel.com> (raw)
In-Reply-To: <20211206161734.GA4141317@maple.netwinder.org>
On Mon, Dec 06, 2021 at 11:17:34AM -0500, Ralph Siemsen wrote:
> On Mon, Dec 06, 2021 at 03:43:11PM +0200, Andy Shevchenko wrote:
> > On Mon, Dec 06, 2021 at 02:49:01PM +1100, Stephen Rothwell wrote:
> > > Hi all,
> > >
> > > Today's linux-next merge of the char-misc tree got a conflict in:
> > >
> > > drivers/misc/eeprom/at25.c
> > >
> > > between commit:
> > >
> > > 9a626577398c ("nvmem: eeprom: at25: fix FRAM byte_len")
>
> This was my original patch from Nov 8th.
>
> > > 5b557298d7d0 ("misc: at25: Make driver OF independent again")
> > > a692fc39bf90 ("misc: at25: Don't copy garbage to the at25->chip in FRAM case")
> > > 58589a75bba9 ("misc: at25: Check proper value of chip length in FRAM case")
> > > 51902c1212fe ("misc: at25: Use at25->chip instead of local chip everywhere in ->probe()")
> > > (and probably more)
>
> These are newer versions and some cleanups from Andy. I was not aware of
> this work going on. I'm surprised at25 is getting so much attention ;-)
Me neither. :-)
> > > I fixed it up (I just used the latter version) 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.
> >
> > The result from char-misc.current should be used as is and I guess it's
> > what you have done, thanks!
>
> Agreed - Andy's version is cleaner, and includes my fixes. I've run some
> quick tests locally and all seems to be working as expected.
Thanks, Ralph!
--
With Best Regards,
Andy Shevchenko
next prev parent reply other threads:[~2021-12-06 16:45 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-06 3:49 linux-next: manual merge of the char-misc tree with the char-misc.current tree Stephen Rothwell
2021-12-06 13:43 ` Andy Shevchenko
2021-12-06 16:17 ` Ralph Siemsen
2021-12-06 16:44 ` Andy Shevchenko [this message]
2021-12-13 9:18 ` Greg KH
2022-01-07 23:18 ` Kees Cook
-- strict thread matches above, loose matches on Subject: below --
2026-05-25 15:07 Mark Brown
2025-11-14 3:32 Stephen Rothwell
2025-11-14 19:10 ` Dinh Nguyen
2025-10-24 1:49 Stephen Rothwell
2025-10-24 5:24 ` Greg KH
2019-10-18 3:26 Stephen Rothwell
2019-10-18 10:06 ` Greg KH
2019-04-03 3:56 Stephen Rothwell
2019-04-03 5:06 ` Srinivas Kandagatla
2019-04-03 6:39 ` Bo YU
2018-12-04 4:35 Stephen Rothwell
2018-12-04 7:42 ` Greg KH
2018-12-04 8:46 ` Dexuan Cui
2018-12-10 9:47 ` Greg KH
2018-12-10 18:51 ` Dexuan Cui
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=Ya491Dtj7HqoMhvW@smile.fi.intel.com \
--to=andriy.shevchenko@linux$(echo .)intel.com \
--cc=arnd@arndb$(echo .)de \
--cc=greg@kroah$(echo .)com \
--cc=gregkh@linuxfoundation$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=ralph.siemsen@linaro$(echo .)org \
--cc=sfr@canb$(echo .)auug.org.au \
/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