In message: Re: [linux-yocto][v5.10/standard/nxp-sdk-5.10/nxp-s32g2xx] nxp-s32g2xx bsp upgrade to bsp33 on 20/01/2023 Zaharia, Adrian wrote:
> Hi Bruce, > > The pull request branch is named bsp33 (https://github.com/azaharia-wr/ > linux-yocto/tree/bsp33) > > Please merge those 216 patches in the following 2 branches: > > • v5.10/standard/nxp-sdk-5.10/nxp-s32g2xx Your branch merges fine to the above branch, but it conflicts with v5.10/standard/preempt-rt/nxp-sdk-5.10/nxp-s32g2xx in about 40 or 50 files. You'll need to to an -rt specific integration and resend the pull request for that branch. Bruce > • v5.10/standard/preempt-rt/nxp-sdk-5.10/nxp-s32g2xx > > Thanks and sorry for the confusion, > Adrian > > > ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ > From: Bruce Ashfield <bruce.ashfi...@gmail.com> > Sent: Thursday, January 19, 2023 11:11 PM > To: Zaharia, Adrian <adrian.zaha...@windriver.com> > Cc: linux-yocto@lists.yoctoproject.org <linux-yocto@lists.yoctoproject.org> > Subject: Re: [linux-yocto][v5.10/standard/nxp-sdk-5.10/nxp-s32g2xx] > nxp-s32g2xx > bsp upgrade to bsp33 > > CAUTION: This email comes from a non Wind River email account! > Do not click links or open attachments unless you recognize the sender and > know > the content is safe. > > In message: [linux-yocto][v5.10/standard/nxp-sdk-5.10/nxp-s32g2xx] nxp-s32g2xx > bsp upgrade to bsp33 > on 18/01/2023 Adrian Zaharia wrote: > > > Hi Bruce, > > > > There are 216 new patches from NXP SDK bsp33 repo, would you please help > merge these > > patches into the v5.10/standard/nxp-sdk-5.10/nxp-s32g2xx branch? > > > > > > The following changes since commit 0634c5dd9f77a9622da91bd53785fbc1b12699fe: > > > > Merge branch 'v5.10/standard/base' into v5.10/standard/nxp-sdk-5.10/ > nxp-s32g2xx (2023-01-12 12:54:03 -0500) > > > > are available in the Git repository at: > > > > https://github.com/azaharia-wr/linux-yocto.git > a7ffb063745fae3d9d4a6dbc89adbfcf3f3f2348 > > That doesn't look like a valid branch name. > > Can you double check the pull request ? > > Bruce > > > > > for you to fetch changes up to a7ffb063745fae3d9d4a6dbc89adbfcf3f3f2348 (see > branch bsp33): > > > > pinctrl: s32: clean up previous pin configuration (2023-01-17 20:17:27 > +0200) > > > > > > In addition the kernel fragments require an update. See email: > > Subject: [yocto-kernel-cache][master/yocto-5.10] nxp-s32g: update kernel > fragments for nxp bsp33 > > > > Thanks, > > Adrian > >
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#12128): https://lists.yoctoproject.org/g/linux-yocto/message/12128 Mute This Topic: https://lists.yoctoproject.org/mt/96354665/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
