Tightening behaviour for non-immutable behaviour in immutable functions

Applying: Add checks on search_path for IMMUTABLE and SECURITY DEFINER functions
Using index info to reconstruct a base tree...
M	src/backend/commands/functioncmds.c
M	src/backend/utils/misc/guc.c
M	src/include/utils/guc.h
Falling back to patching base and 3-way merge...
Auto-merging src/include/utils/guc.h
Auto-merging src/backend/utils/misc/guc.c
CONFLICT (content): Merge conflict in src/backend/utils/misc/guc.c
Auto-merging src/backend/commands/functioncmds.c
Patch failed at 0001 Add checks on search_path for IMMUTABLE and SECURITY DEFINER functions

/ci/repo/worktrees/worktree/rebase-apply/patch:21: trailing whitespace.
 */ 
/ci/repo/worktrees/worktree/rebase-apply/patch:35: trailing whitespace.
	
/ci/repo/worktrees/worktree/rebase-apply/patch:73: trailing whitespace.
		
/ci/repo/worktrees/worktree/rebase-apply/patch:165: trailing whitespace.
		
warning: 4 lines add whitespace errors.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"