Hi all,

Today's linux-next merge of the ftrace tree got a conflict in:


between commits:

  8f34c5b5afce ("x86/exceptions: Make IST index zero based")
  3207426925d2 ("x86/exceptions: Disconnect IST index and stack order")
  2a594d4ccf3f ("x86/exceptions: Split debug IST stack")

from Linus' tree and commit:

  2700fefdb2d9 ("x86_64: Add gap to int3 to allow for call emulation")

from the ftrace tree.

I fixed it up (see below) 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.

Stephen Rothwell

diff --cc arch/x86/entry/entry_64.S
index 20e45d9b4e15,27fcc6fbdd52..000000000000
--- a/arch/x86/entry/entry_64.S
+++ b/arch/x86/entry/entry_64.S
@@@ -878,7 -879,7 +878,7 @@@ apicinterrupt IRQ_WORK_VECTOR                      
   * @paranoid == 2 is special: the stub will never switch stacks.  This is for
   * #DF: if the thread stack is somehow unusable, we'll still get a useful 
- .macro idtentry sym do_sym has_error_code:req paranoid=0 shift_ist=-1 
 -.macro idtentry sym do_sym has_error_code:req paranoid=0 shift_ist=-1 
++.macro idtentry sym do_sym has_error_code:req paranoid=0 shift_ist=-1 
ist_offset=0 create_gap=0
        UNWIND_HINT_IRET_REGS offset=\has_error_code*8
@@@ -1128,8 -1143,8 +1142,8 @@@ apicinterrupt3 HYPERV_STIMER0_VECTOR 
        hv_stimer0_callback_vector hv_stimer0_vector_handler
  #endif /* CONFIG_HYPERV */
 -idtentry debug                        do_debug                
has_error_code=0        paranoid=1 shift_ist=DEBUG_STACK
 +idtentry debug                        do_debug                
has_error_code=0        paranoid=1 shift_ist=IST_INDEX_DB 
- idtentry int3                 do_int3                 has_error_code=0
+ idtentry int3                 do_int3                 has_error_code=0        
  idtentry stack_segment                do_stack_segment        has_error_code=1
  #ifdef CONFIG_XEN_PV

Attachment: pgp0GYCw_e2pN.pgp
Description: OpenPGP digital signature

Reply via email to