[foreign-preview] RFR: Merge master [v2]

J.Duke duke at openjdk.java.net
Fri Feb 25 13:03:03 UTC 2022


> Hi all,
> 
> this is an _automatically_ generated pull request to notify you that there are 68 commits from the branch `master`that can **not** be merged into the branch `foreign-preview`:
> 
> The following file contains merge conflicts:
> 
> - src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
> 
> All Committers in this [project](https://openjdk.java.net/census#panama) have access to my [personal fork](https://github.com/openjdk-bot/panama-foreign) and can therefore help resolve these merge conflicts (you may want to coordinate who should do this).
> The following paragraphs will give an example on how to solve these merge conflicts and push the resulting merge commit to this pull request.
> The below commands should be run in a local clone of your [personal fork](https://wiki.openjdk.java.net/display/skara#Skara-Personalforks) of the [openjdk/panama-foreign](https://github.com/openjdk/panama-foreign) repository.
> 
> 
> # Ensure target branch is up to date
> $ git checkout foreign-preview
> $ git pull https://github.com/openjdk/panama-foreign.git foreign-preview
> 
> # Fetch and checkout the branch for this pull request
> $ git fetch https://github.com/openjdk-bot/panama-foreign.git +116:openjdk-bot-116
> $ git checkout openjdk-bot-116
> 
> # Merge the target branch
> $ git merge foreign-preview
> 
> 
> When you have resolved the conflicts resulting from the `git merge` command above, run the following commands to create a merge commit:
> 
> 
> $ git add paths/to/files/with/conflicts
> $ git commit -m 'Merge master'
> 
> 
> 
> When you have created the merge commit, run the following command to push the merge commit to this pull request:
> 
> 
> $ git push https://github.com/openjdk-bot/panama-foreign.git openjdk-bot-116:116
> 
> 
> _Note_: if you are using SSH to push commits to GitHub, then change the URL in the above `git push` command accordingly.
> 
> Thanks,
> J. Duke

J. Duke has updated the pull request with a new target base due to a merge or a rebase. The pull request now contains 69 commits:

 - Merge branch 'foreign-preview' into 116
 - Automatic merge of jdk:master into master
 - 8282347: AARCH64: Untaken branch in has_negatives stub
   
   Reviewed-by: aph, haosun, thartmann
 - 8206187: javax/management/remote/mandatory/connection/DefaultAgentFilterTest.java fails with Port already in use
   
   Reviewed-by: msheppar, amenkov
 - 8280357: user.home = "?" when running with systemd DynamicUser=true
   
   Reviewed-by: naoto, alanb
 - 8005885: enhance PrintCodeCache to print more data
   
   Reviewed-by: xliu, phh
 - 8281525: Enable Zc:strictStrings flag in Visual Studio build
   
   Reviewed-by: dholmes, ihse
 - 8282307: Parallel: Incorrect discovery mode in PCReferenceProcessor
   
   Reviewed-by: tschatzl, kbarrett
 - 8282348: Remove unused CardTable::dirty_card_iterate
   
   Reviewed-by: kbarrett
 - 8277204: Implement PAC-RET branch protection on Linux/AArch64
   
   Reviewed-by: erikj, ihse, adinn, ngasson
 - ... and 59 more: https://git.openjdk.java.net/panama-foreign/compare/9247f980...9eb3b0b9

-------------

Changes: https://git.openjdk.java.net/panama-foreign/pull/657/files
 Webrev: https://webrevs.openjdk.java.net/?repo=panama-foreign&pr=657&range=01
  Stats: 8055 lines in 192 files changed: 5290 ins; 1119 del; 1646 mod
  Patch: https://git.openjdk.java.net/panama-foreign/pull/657.diff
  Fetch: git fetch https://git.openjdk.java.net/panama-foreign pull/657/head:pull/657

PR: https://git.openjdk.java.net/panama-foreign/pull/657


More information about the panama-dev mailing list